Move the xe display glue code for shutdown and pm hooks from xe_display.c to intel_display_driver.c. This is a small step towards unifying the display interfaces between i915 and xe drivers. The code belongs in display, not in i915 or xe driver. Neither the xe nor i915 core code should be calling deep into display functionality.
The high level functions are obviously modeled after the xe driver now. The i915 driver needs to start calling them as well. For this, they may need to be further changed and refactored, but this needs to happen in display side. Clean up xe_display.c includes as many of them become unnecessary. Signed-off-by: Jani Nikula <[email protected]> --- .../drm/i915/display/intel_display_driver.c | 189 ++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 12 ++ drivers/gpu/drm/xe/display/xe_display.c | 185 ++--------------- 3 files changed, 214 insertions(+), 172 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index d0729936f681..15ba4c2ac985 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -43,6 +43,7 @@ #include "intel_dp_tunnel.h" #include "intel_dpll.h" #include "intel_dpll_mgr.h" +#include "intel_encoder.h" #include "intel_fb.h" #include "intel_fbc.h" #include "intel_fbdev.h" @@ -780,3 +781,191 @@ void intel_display_driver_resume(struct intel_display *display) if (state) drm_atomic_commit_put(state); } + +/* + * FIXME: The below interfaces are currently only being called from the xe + * driver code. They need to be unified with the needs of the i915 driver hooks, + * and i915 needs to migrate over to them. + */ + +void intel_display_driver_shutdown(struct intel_display *display) +{ + intel_display_power_disable(display); + drm_client_dev_suspend(display->drm); + + if (intel_display_device_present(display)) { + drm_kms_helper_poll_disable(display->drm); + intel_display_driver_disable_user_access(display); + intel_display_driver_suspend(display); + } + + intel_display_flush_cleanup_work(display); + intel_dp_mst_suspend(display); + intel_encoder_block_all_hpds(display); + intel_hpd_cancel_work(display); + + if (intel_display_device_present(display)) + intel_display_driver_suspend_access(display); + + intel_encoder_suspend_all(display); + intel_encoder_shutdown_all(display); + + intel_opregion_suspend(display, PCI_D3cold); + + intel_dmc_suspend(display); +} + +void intel_display_driver_shutdown_late(struct intel_display *display) +{ + /* + * The only requirement is to reboot with display DC states disabled, + * for now leaving all display power wells in the INIT power domain + * enabled. + */ + intel_display_power_driver_remove(display); +} + +static bool suspend_to_idle(void) +{ +#if IS_ENABLED(CONFIG_ACPI_SLEEP) + if (acpi_target_system_state() < ACPI_STATE_S3) + return true; +#endif + return false; +} + +void intel_display_driver_pm_enable_d3cold(struct intel_display *display) +{ + /* + * We do a lot of poking in a lot of registers, make sure they work + * properly. + */ + intel_display_power_disable(display); + + intel_display_flush_cleanup_work(display); + + intel_opregion_suspend(display, PCI_D3cold); + + intel_dmc_suspend(display); + + if (intel_display_device_present(display)) + intel_hpd_poll_enable(display); +} + +void intel_display_driver_pm_disable_d3cold(struct intel_display *display) +{ + intel_dmc_resume(display); + + if (intel_display_device_present(display)) + drm_mode_config_reset(display->drm); + + intel_display_driver_init_hw(display); + + intel_hpd_init(display); + + if (intel_display_device_present(display)) + intel_hpd_poll_disable(display); + + intel_opregion_resume(display); + + intel_display_power_enable(display); +} + +void intel_display_driver_pm_suspend(struct intel_display *display) +{ + bool s2idle = suspend_to_idle(); + + /* + * We do a lot of poking in a lot of registers, make sure they work + * properly. + */ + intel_display_power_disable(display); + drm_client_dev_suspend(display->drm); + + if (intel_display_device_present(display)) { + drm_kms_helper_poll_disable(display->drm); + intel_display_driver_disable_user_access(display); + intel_display_driver_suspend(display); + } + + intel_display_flush_cleanup_work(display); + + intel_encoder_block_all_hpds(display); + + intel_hpd_cancel_work(display); + + if (intel_display_device_present(display)) { + intel_display_driver_suspend_access(display); + intel_encoder_suspend_all(display); + } + + intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold); + + intel_dmc_suspend(display); +} + +void intel_display_driver_pm_suspend_late(struct intel_display *display) +{ + bool s2idle = suspend_to_idle(); + + intel_display_power_suspend_late(display, s2idle); +} + +void intel_display_driver_pm_resume_early(struct intel_display *display) +{ + intel_display_power_resume_early(display); +} + +void intel_display_driver_pm_resume(struct intel_display *display) +{ + intel_dmc_resume(display); + + if (intel_display_device_present(display)) + drm_mode_config_reset(display->drm); + + intel_display_driver_init_hw(display); + + if (intel_display_device_present(display)) + intel_display_driver_resume_access(display); + + intel_hpd_init(display); + + intel_encoder_unblock_all_hpds(display); + + if (intel_display_device_present(display)) { + intel_display_driver_resume(display); + drm_kms_helper_poll_enable(display->drm); + intel_display_driver_enable_user_access(display); + } + + if (intel_display_device_present(display)) + intel_hpd_poll_disable(display); + + intel_opregion_resume(display); + + drm_client_dev_resume(display->drm); + + intel_display_power_enable(display); +} + +void intel_display_driver_pm_runtime_suspend(struct intel_display *display) +{ + intel_hpd_poll_enable(display); +} + +void intel_display_driver_pm_runtime_suspend_late(struct intel_display *display) +{ + /* + * If xe_display_pm_suspend_late() is not called, it is likely + * that we will be on dynamic DC states with DMC wakelock enabled. We + * need to flush the release work in that case. + */ + intel_dmc_wl_flush_release_work(display); +} + +void intel_display_driver_pm_runtime_resume(struct intel_display *display) +{ + intel_hpd_init(display); + intel_hpd_poll_disable(display); + skl_watermark_ipc_update(display); +} diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h index 5270c26a32e0..e4ce17efe793 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.h +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h @@ -26,6 +26,8 @@ void intel_display_driver_remove_nogem(struct intel_display *display); void intel_display_driver_unregister(struct intel_display *display); int intel_display_driver_suspend(struct intel_display *display); void intel_display_driver_resume(struct intel_display *display); +void intel_display_driver_shutdown(struct intel_display *display); +void intel_display_driver_shutdown_late(struct intel_display *display); /* interface for intel_display_reset.c */ int __intel_display_driver_resume(struct intel_display *display, @@ -38,5 +40,15 @@ void intel_display_driver_suspend_access(struct intel_display *display); void intel_display_driver_resume_access(struct intel_display *display); bool intel_display_driver_check_access(struct intel_display *display); +void intel_display_driver_pm_enable_d3cold(struct intel_display *display); +void intel_display_driver_pm_disable_d3cold(struct intel_display *display); +void intel_display_driver_pm_suspend(struct intel_display *display); +void intel_display_driver_pm_suspend_late(struct intel_display *display); +void intel_display_driver_pm_resume_early(struct intel_display *display); +void intel_display_driver_pm_resume(struct intel_display *display); +void intel_display_driver_pm_runtime_suspend(struct intel_display *display); +void intel_display_driver_pm_runtime_suspend_late(struct intel_display *display); +void intel_display_driver_pm_runtime_resume(struct intel_display *display); + #endif /* __INTEL_DISPLAY_DRIVER_H__ */ diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index a18af4d96dd1..6aba5668e4df 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -6,36 +6,22 @@ #include "xe_display.h" #include "regs/xe_irq_regs.h" -#include <linux/fb.h> - -#include <drm/drm_client.h> -#include <drm/drm_client_event.h> #include <drm/drm_drv.h> #include <drm/drm_managed.h> -#include <drm/drm_probe_helper.h> #include <drm/intel/display_member.h> #include <drm/intel/display_parent_interface.h> -#include <uapi/drm/xe_drm.h> -#include "intel_acpi.h" #include "intel_audio.h" #include "intel_bw.h" -#include "intel_display.h" -#include "intel_display_core.h" #include "intel_display_device.h" #include "intel_display_driver.h" #include "intel_display_irq.h" -#include "intel_display_types.h" -#include "intel_dmc.h" -#include "intel_dmc_wl.h" -#include "intel_dp.h" +#include "intel_display_power.h" #include "intel_dram.h" -#include "intel_encoder.h" #include "intel_fbdev.h" #include "intel_hdcp.h" #include "intel_hotplug.h" #include "intel_opregion.h" -#include "skl_watermark.h" #include "xe_device.h" #include "xe_display_bo.h" #include "xe_display_pcode.h" @@ -235,97 +221,14 @@ void xe_display_irq_postinstall(struct xe_device *xe) intel_display_irq_postinstall(display); } -static bool suspend_to_idle(void) -{ -#if IS_ENABLED(CONFIG_ACPI_SLEEP) - if (acpi_target_system_state() < ACPI_STATE_S3) - return true; -#endif - return false; -} - -static void xe_display_enable_d3cold(struct xe_device *xe) -{ - struct intel_display *display = xe->display; - - if (!xe->info.probe_display) - return; - - /* - * We do a lot of poking in a lot of registers, make sure they work - * properly. - */ - intel_display_power_disable(display); - - intel_display_flush_cleanup_work(display); - - intel_opregion_suspend(display, PCI_D3cold); - - intel_dmc_suspend(display); - - if (intel_display_device_present(display)) - intel_hpd_poll_enable(display); -} - -static void xe_display_disable_d3cold(struct xe_device *xe) -{ - struct intel_display *display = xe->display; - - if (!xe->info.probe_display) - return; - - intel_dmc_resume(display); - - if (intel_display_device_present(display)) - drm_mode_config_reset(&xe->drm); - - intel_display_driver_init_hw(display); - - intel_hpd_init(display); - - if (intel_display_device_present(display)) - intel_hpd_poll_disable(display); - - intel_opregion_resume(display); - - intel_display_power_enable(display); -} - void xe_display_pm_suspend(struct xe_device *xe) { struct intel_display *display = xe->display; - bool s2idle = suspend_to_idle(); if (!xe->info.probe_display) return; - /* - * We do a lot of poking in a lot of registers, make sure they work - * properly. - */ - intel_display_power_disable(display); - drm_client_dev_suspend(&xe->drm); - - if (intel_display_device_present(display)) { - drm_kms_helper_poll_disable(&xe->drm); - intel_display_driver_disable_user_access(display); - intel_display_driver_suspend(display); - } - - intel_display_flush_cleanup_work(display); - - intel_encoder_block_all_hpds(display); - - intel_hpd_cancel_work(display); - - if (intel_display_device_present(display)) { - intel_display_driver_suspend_access(display); - intel_encoder_suspend_all(display); - } - - intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold); - - intel_dmc_suspend(display); + intel_display_driver_pm_suspend(display); } void xe_display_shutdown(struct xe_device *xe) @@ -335,29 +238,7 @@ void xe_display_shutdown(struct xe_device *xe) if (!xe->info.probe_display) return; - intel_display_power_disable(display); - drm_client_dev_suspend(&xe->drm); - - if (intel_display_device_present(display)) { - drm_kms_helper_poll_disable(&xe->drm); - intel_display_driver_disable_user_access(display); - intel_display_driver_suspend(display); - } - - intel_display_flush_cleanup_work(display); - intel_dp_mst_suspend(display); - intel_encoder_block_all_hpds(display); - intel_hpd_cancel_work(display); - - if (intel_display_device_present(display)) - intel_display_driver_suspend_access(display); - - intel_encoder_suspend_all(display); - intel_encoder_shutdown_all(display); - - intel_opregion_suspend(display, PCI_D3cold); - - intel_dmc_suspend(display); + intel_display_driver_shutdown(display); } void xe_display_pm_runtime_suspend(struct xe_device *xe) @@ -368,22 +249,21 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe) return; if (xe->d3cold.allowed) { - xe_display_enable_d3cold(xe); + intel_display_driver_pm_enable_d3cold(display); return; } - intel_hpd_poll_enable(display); + intel_display_driver_pm_runtime_suspend(display); } void xe_display_pm_suspend_late(struct xe_device *xe) { struct intel_display *display = xe->display; - bool s2idle = suspend_to_idle(); if (!xe->info.probe_display) return; - intel_display_power_suspend_late(display, s2idle); + intel_display_driver_pm_suspend_late(display); } void xe_display_pm_runtime_suspend_late(struct xe_device *xe) @@ -394,14 +274,9 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe) return; if (xe->d3cold.allowed) - xe_display_pm_suspend_late(xe); + intel_display_driver_pm_suspend_late(display); - /* - * If xe_display_pm_suspend_late() is not called, it is likely - * that we will be on dynamic DC states with DMC wakelock enabled. We - * need to flush the release work in that case. - */ - intel_dmc_wl_flush_release_work(display); + intel_display_driver_pm_runtime_suspend_late(display); } void xe_display_shutdown_late(struct xe_device *xe) @@ -411,12 +286,7 @@ void xe_display_shutdown_late(struct xe_device *xe) if (!xe->info.probe_display) return; - /* - * The only requirement is to reboot with display DC states disabled, - * for now leaving all display power wells in the INIT power domain - * enabled. - */ - intel_display_power_driver_remove(display); + intel_display_driver_shutdown_late(display); } void xe_display_pm_resume_early(struct xe_device *xe) @@ -426,7 +296,7 @@ void xe_display_pm_resume_early(struct xe_device *xe) if (!xe->info.probe_display) return; - intel_display_power_resume_early(display); + intel_display_driver_pm_resume_early(display); } void xe_display_pm_resume(struct xe_device *xe) @@ -436,34 +306,7 @@ void xe_display_pm_resume(struct xe_device *xe) if (!xe->info.probe_display) return; - intel_dmc_resume(display); - - if (intel_display_device_present(display)) - drm_mode_config_reset(&xe->drm); - - intel_display_driver_init_hw(display); - - if (intel_display_device_present(display)) - intel_display_driver_resume_access(display); - - intel_hpd_init(display); - - intel_encoder_unblock_all_hpds(display); - - if (intel_display_device_present(display)) { - intel_display_driver_resume(display); - drm_kms_helper_poll_enable(&xe->drm); - intel_display_driver_enable_user_access(display); - } - - if (intel_display_device_present(display)) - intel_hpd_poll_disable(display); - - intel_opregion_resume(display); - - drm_client_dev_resume(&xe->drm); - - intel_display_power_enable(display); + intel_display_driver_pm_resume(display); } void xe_display_pm_runtime_resume(struct xe_device *xe) @@ -474,13 +317,11 @@ void xe_display_pm_runtime_resume(struct xe_device *xe) return; if (xe->d3cold.allowed) { - xe_display_disable_d3cold(xe); + intel_display_driver_pm_disable_d3cold(display); return; } - intel_hpd_init(display); - intel_hpd_poll_disable(display); - skl_watermark_ipc_update(display); + intel_display_driver_pm_runtime_resume(display); } -- 2.47.3
