On Fri, 12 Oct 2018, José Roberto de Souza <jose.souza@xxxxxxxxx> wrote:
> Display features should not be initialized or deinitialized when
> display is disabled.
>
> With this changes no plane, CRTC, encoder or connector
> is being registered in drm when display is disabled so it was also
> necessary unset DRIVER_MODESET and DRIVER_ATOMIC features from driver
> otherwise it will crash when registering driver in drm.
>
> There is still more modeset/display calls that will be removed in
> futher patches.
>
> Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
>
> squash do not call modeset
> ---
> drivers/gpu/drm/i915/i915_drv.c | 155 +++++++++++++++---------
> drivers/gpu/drm/i915/i915_suspend.c | 24 ++--
> drivers/gpu/drm/i915/intel_runtime_pm.c | 21 ++--
> 3 files changed, 124 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 3f7514e981d5..8334d1797df7 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -899,7 +899,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv)
> intel_wopcm_init_early(&dev_priv->wopcm);
> intel_uc_init_early(dev_priv);
> intel_pm_setup(dev_priv);
> - intel_init_dpio(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_init_dpio(dev_priv);
> ret = intel_power_domains_init(dev_priv);
> if (ret < 0)
> goto err_uc;
> @@ -907,8 +908,10 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv)
> intel_hangcheck_init(dev_priv);
> intel_init_display_hooks(dev_priv);
> intel_init_clock_gating_hooks(dev_priv);
> - intel_init_audio_hooks(dev_priv);
> - intel_display_crc_init(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_init_audio_hooks(dev_priv);
> + intel_display_crc_init(dev_priv);
> + }
>
> intel_detect_preproduction_hw(dev_priv);
>
> @@ -1539,23 +1542,26 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
> if (IS_GEN5(dev_priv))
> intel_gpu_ips_init(dev_priv);
>
> - intel_audio_init(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_audio_init(dev_priv);
>
> - /*
> - * Some ports require correctly set-up hpd registers for detection to
> - * work properly (leading to ghost connected connector status), e.g. VGA
> - * on gm45. Hence we can only set up the initial fbdev config after hpd
> - * irqs are fully enabled. We do it last so that the async config
> - * cannot run before the connectors are registered.
> - */
> - intel_fbdev_initial_config_async(dev);
> + /*
> + * Some ports require correctly set-up hpd registers for
> + * detection to work properly (leading to ghost connected
> + * connector status), e.g. VGA on gm45. Hence we can only set
> + * up the initial fbdev config after hpd irqs are fully enabled.
> + * We do it last so that the async config cannot run before the
> + * connectors are registered.
> + */
> + intel_fbdev_initial_config_async(dev);
So for all of the above that we're in control of, I'd put the display
check and early return at the beginning of each function, and call them
unconditionally from here. This particularly so for all the higher level
functions. They become cluttered and hard to grasp. It's slightly
different at the lower levels.
I think we need a macro
#define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->num_pipes != 0)
and use that for anything that checks for the binary has display or
not. We may need to redefine that later on, and I don't want to touch
all of these places again.
>
> - /*
> - * We need to coordinate the hotplugs with the asynchronous fbdev
> - * configuration, for which we use the fbdev->async_cookie.
> - */
> - if (INTEL_INFO(dev_priv)->num_pipes)
> + /*
> + * We need to coordinate the hotplugs with the asynchronous
> + * fbdev configuration, for which we use the
> + * fbdev->async_cookie.
> + */
> drm_kms_helper_poll_init(dev);
> + }
Obviously calls to drm helpers need to be wrapped around HAS_DISPLAY.
>
> intel_power_domains_enable(dev_priv);
> intel_runtime_pm_enable(dev_priv);
> @@ -1570,15 +1576,17 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
> intel_runtime_pm_disable(dev_priv);
> intel_power_domains_disable(dev_priv);
>
> - intel_fbdev_unregister(dev_priv);
> - intel_audio_deinit(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_fbdev_unregister(dev_priv);
> + intel_audio_deinit(dev_priv);
All of these I want to be able to call unconditionally too, and instead
of checking for HAS_DISPLAY(), they might be better off checking whether
the stuff has been initialized. Indeed, I think the above two already
work like this; they can be safely called even when audio or fbdev
hasn't been initialized.
BR,
Jani.
>
> - /*
> - * After flushing the fbdev (incl. a late async config which will
> - * have delayed queuing of a hotplug event), then flush the hotplug
> - * events.
> - */
> - drm_kms_helper_poll_fini(&dev_priv->drm);
> + /*
> + * After flushing the fbdev (incl. a late async config which
> + * will have delayed queuing of a hotplug event), then flush the
> + * hotplug events.
> + */
> + drm_kms_helper_poll_fini(&dev_priv->drm);
> + }
>
> intel_gpu_ips_teardown();
> acpi_video_unregister();
> @@ -1641,6 +1649,7 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (i915_modparams.disable_display) {
> DRM_INFO("Display disabled (module parameter)\n");
> device_info->num_pipes = 0;
> + i915->drm.driver_features &= ~(DRIVER_MODESET | DRIVER_ATOMIC);
> }
>
> BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
> @@ -1721,9 +1730,11 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (ret)
> goto cleanup_irq;
>
> - ret = i915_load_modeset_init(&dev_priv->drm);
> - if (ret < 0)
> - goto cleanup_gem;
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + ret = i915_load_modeset_init(&dev_priv->drm);
> + if (ret < 0)
> + goto cleanup_gem;
> + }
>
> i915_driver_register(dev_priv);
>
> @@ -1780,11 +1791,13 @@ void i915_driver_unload(struct drm_device *dev)
> if (i915_gem_suspend(dev_priv))
> DRM_ERROR("failed to idle hardware; continuing to unload!\n");
>
> - drm_atomic_helper_shutdown(dev);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + drm_atomic_helper_shutdown(dev);
>
> intel_gvt_cleanup(dev_priv);
>
> - intel_modeset_cleanup_prepare(dev);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_modeset_cleanup_prepare(dev);
>
> /*
> * Interrupts and polling as the first thing to avoid creating havoc.
> @@ -1793,9 +1806,11 @@ void i915_driver_unload(struct drm_device *dev)
> */
> intel_irq_uninstall(dev_priv);
>
> - intel_modeset_cleanup(dev);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_modeset_cleanup(dev);
>
> - i915_modeset_unload(dev);
> + i915_modeset_unload(dev);
> + }
>
> /* Free error state after interrupts are fully disabled. */
> cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
> @@ -1847,8 +1862,12 @@ static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> */
> static void i915_driver_lastclose(struct drm_device *dev)
> {
> - intel_fbdev_restore_mode(dev);
> - vga_switcheroo_process_delayed_switch();
> + struct drm_i915_private *dev_priv = to_i915(dev);
> +
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_fbdev_restore_mode(dev);
> + vga_switcheroo_process_delayed_switch();
> + }
> }
>
> static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
> @@ -1918,19 +1937,24 @@ static int i915_drm_suspend(struct drm_device *dev)
> /* We do a lot of poking in a lot of registers, make sure they work
> * properly. */
> intel_power_domains_disable(dev_priv);
> -
> - drm_kms_helper_poll_disable(dev);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + drm_kms_helper_poll_disable(dev);
>
> pci_save_state(pdev);
>
> - intel_display_suspend(dev);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_display_suspend(dev);
>
> - intel_dp_mst_suspend(dev_priv);
> + intel_dp_mst_suspend(dev_priv);
> + }
>
> intel_runtime_pm_disable_interrupts(dev_priv);
> - intel_hpd_cancel_work(dev_priv);
>
> - intel_suspend_encoders(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_hpd_cancel_work(dev_priv);
> +
> + intel_suspend_encoders(dev_priv);
> + }
>
> intel_suspend_hw(dev_priv);
>
> @@ -1943,11 +1967,13 @@ static int i915_drm_suspend(struct drm_device *dev)
>
> intel_opregion_unregister(dev_priv);
>
> - intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
>
> dev_priv->suspend_count++;
>
> - intel_csr_ucode_suspend(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_csr_ucode_suspend(dev_priv);
>
> enable_rpm_wakeref_asserts(dev_priv);
>
> @@ -2056,10 +2082,12 @@ static int i915_drm_resume(struct drm_device *dev)
> if (ret)
> DRM_ERROR("failed to re-enable GGTT\n");
>
> - intel_csr_ucode_resume(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_csr_ucode_resume(dev_priv);
>
> i915_restore_state(dev_priv);
> - intel_pps_unlock_regs_wa(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_pps_unlock_regs_wa(dev_priv);
> intel_opregion_setup(dev_priv);
>
> intel_init_pch_refclk(dev_priv);
> @@ -2076,7 +2104,8 @@ static int i915_drm_resume(struct drm_device *dev)
> */
> intel_runtime_pm_enable_interrupts(dev_priv);
>
> - drm_mode_config_reset(dev);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + drm_mode_config_reset(dev);
>
> i915_gem_resume(dev_priv);
>
> @@ -2084,27 +2113,30 @@ static int i915_drm_resume(struct drm_device *dev)
> intel_init_clock_gating(dev_priv);
>
> spin_lock_irq(&dev_priv->irq_lock);
> - if (dev_priv->display.hpd_irq_setup)
> + if (dev_priv->display.hpd_irq_setup && INTEL_INFO(dev_priv)->num_pipes)
> dev_priv->display.hpd_irq_setup(dev_priv);
> spin_unlock_irq(&dev_priv->irq_lock);
>
> - intel_dp_mst_resume(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + intel_dp_mst_resume(dev_priv);
>
> - intel_display_resume(dev);
> + intel_display_resume(dev);
>
> - drm_kms_helper_poll_enable(dev);
> + drm_kms_helper_poll_enable(dev);
>
> - /*
> - * ... but also need to make sure that hotplug processing
> - * doesn't cause havoc. Like in the driver load code we don't
> - * bother with the tiny race here where we might lose hotplug
> - * notifications.
> - * */
> - intel_hpd_init(dev_priv);
> + /*
> + * ... but also need to make sure that hotplug processing
> + * doesn't cause havoc. Like in the driver load code we don't
> + * bother with the tiny race here where we might lose hotplug
> + * notifications.
> + */
> + intel_hpd_init(dev_priv);
> + }
>
> intel_opregion_register(dev_priv);
>
> - intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING, false);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING, false);
>
> intel_opregion_notify_adapter(dev_priv, PCI_D0);
>
> @@ -3000,7 +3032,8 @@ static int intel_runtime_suspend(struct device *kdev)
>
> assert_forcewakes_inactive(dev_priv);
>
> - if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
> + if (INTEL_INFO(dev_priv)->num_pipes && (!IS_VALLEYVIEW(dev_priv) &&
> + !IS_CHERRYVIEW(dev_priv)))
> intel_hpd_poll_init(dev_priv);
>
> DRM_DEBUG_KMS("Device suspended\n");
> @@ -3057,10 +3090,12 @@ static int intel_runtime_resume(struct device *kdev)
> * power well, so hpd is reinitialized from there. For
> * everyone else do it here.
> */
> - if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
> + if (INTEL_INFO(dev_priv)->num_pipes && (!IS_VALLEYVIEW(dev_priv) &&
> + !IS_CHERRYVIEW(dev_priv)))
> intel_hpd_init(dev_priv);
>
> - intel_enable_ipc(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_enable_ipc(dev_priv);
>
> enable_rpm_wakeref_asserts(dev_priv);
>
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index 8f3aa4dc0c98..f697865236a6 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -63,11 +63,13 @@ int i915_save_state(struct drm_i915_private *dev_priv)
>
> mutex_lock(&dev_priv->drm.struct_mutex);
>
> - i915_save_display(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + i915_save_display(dev_priv);
>
> - if (IS_GEN4(dev_priv))
> - pci_read_config_word(pdev, GCDGMBUS,
> - &dev_priv->regfile.saveGCDGMBUS);
> + if (IS_GEN4(dev_priv))
> + pci_read_config_word(pdev, GCDGMBUS,
> + &dev_priv->regfile.saveGCDGMBUS);
> + }
>
> /* Cache mode state */
> if (INTEL_GEN(dev_priv) < 7)
> @@ -108,10 +110,13 @@ int i915_restore_state(struct drm_i915_private *dev_priv)
>
> mutex_lock(&dev_priv->drm.struct_mutex);
>
> - if (IS_GEN4(dev_priv))
> - pci_write_config_word(pdev, GCDGMBUS,
> - dev_priv->regfile.saveGCDGMBUS);
> - i915_restore_display(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + if (IS_GEN4(dev_priv))
> + pci_write_config_word(pdev, GCDGMBUS,
> + dev_priv->regfile.saveGCDGMBUS);
> +
> + i915_restore_display(dev_priv);
> + }
>
> /* Cache mode state */
> if (INTEL_GEN(dev_priv) < 7)
> @@ -143,7 +148,8 @@ int i915_restore_state(struct drm_i915_private *dev_priv)
>
> mutex_unlock(&dev_priv->drm.struct_mutex);
>
> - intel_i2c_reset(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_i2c_reset(dev_priv);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 3cf8533e0834..15fd88bb35f7 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -625,7 +625,8 @@ void bxt_enable_dc9(struct drm_i915_private *dev_priv)
>
> DRM_DEBUG_KMS("Enabling DC9\n");
>
> - intel_power_sequencer_reset(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_power_sequencer_reset(dev_priv);
> gen9_set_dc_state(dev_priv, DC_STATE_EN_DC9);
> }
>
> @@ -1039,10 +1040,12 @@ static void vlv_display_power_well_deinit(struct drm_i915_private *dev_priv)
> /* make sure we're done processing display irqs */
> synchronize_irq(dev_priv->drm.irq);
>
> - intel_power_sequencer_reset(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + intel_power_sequencer_reset(dev_priv);
>
> /* Prevent us from re-enabling polling on accident in late suspend */
> - if (!dev_priv->drm.dev->power.is_suspended)
> + if (INTEL_INFO(dev_priv)->num_pipes &&
> + !dev_priv->drm.dev->power.is_suspended)
> intel_hpd_poll_init(dev_priv);
> }
>
> @@ -1284,11 +1287,14 @@ static void chv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
>
> if (power_well->desc->id == VLV_DISP_PW_DPIO_CMN_BC) {
> phy = DPIO_PHY0;
> - assert_pll_disabled(dev_priv, PIPE_A);
> - assert_pll_disabled(dev_priv, PIPE_B);
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + assert_pll_disabled(dev_priv, PIPE_A);
> + assert_pll_disabled(dev_priv, PIPE_B);
> + }
> } else {
> phy = DPIO_PHY1;
> - assert_pll_disabled(dev_priv, PIPE_C);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + assert_pll_disabled(dev_priv, PIPE_C);
> }
>
> dev_priv->chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT(phy);
> @@ -1302,7 +1308,8 @@ static void chv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
> /* PHY is fully reset now, so we can enable the PHY state asserts */
> dev_priv->chv_phy_assert[phy] = true;
>
> - assert_chv_phy_status(dev_priv);
> + if (INTEL_INFO(dev_priv)->num_pipes)
> + assert_chv_phy_status(dev_priv);
> }
>
> static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpio_phy phy,
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
