mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 08:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/{i915, xe}: move more calls inside intel_display_driver_pm_resume()

Browse Source 
The intel_display_driver_pm_resume() calls are surrounded by near
identical display calls. Move the calls inside
intel_display_driver_pm_resume().

There's a slight functional change in that
intel_display_driver_pm_resume() returns early for
!HAS_DISPLAY(). Assume this is what we want, and there are no cases
where display engine is present but all pipes have been fused off.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/2cb01e10de88e6436c54643acbcef2afd3188a58.1780389001.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
2026-06-02 11:32:46 +03:00
parent 19cae40d70
commit f597d4b2fd
3 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/i915/display/intel_display_driver.c
View File

@@ -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"
@@ -761,6 +762,12 @@ void intel_display_driver_pm_resume(struct intel_display *display)
if (!HAS_DISPLAY(display))
return;
intel_display_driver_resume_access(display);
intel_hpd_init(display);
intel_encoder_unblock_all_hpds(display);
/* MST sideband requires HPD interrupts enabled */
intel_dp_mst_resume(display);
@@ -790,4 +797,15 @@ void intel_display_driver_pm_resume(struct intel_display *display)
"Restoring old state failed with %i\n", ret);
if (state)
drm_atomic_commit_put(state);
intel_display_driver_enable_user_access(display);
drm_kms_helper_poll_enable(display->drm);
intel_hpd_poll_disable(display);
intel_opregion_resume(display);
drm_client_dev_resume(display->drm);
intel_display_power_enable(display);
}

19
drivers/gpu/drm/i915/i915_driver.c
View File

@@ -1309,27 +1309,8 @@ static int i915_drm_resume(struct drm_device *dev)
intel_clock_gating_init(&dev_priv->drm);
if (intel_display_device_present(display))
intel_display_driver_resume_access(display);
intel_hpd_init(display);
intel_encoder_unblock_all_hpds(display);
intel_display_driver_pm_resume(display);
if (intel_display_device_present(display)) {
intel_display_driver_enable_user_access(display);
drm_kms_helper_poll_enable(dev);
}
intel_hpd_poll_disable(display);
intel_opregion_resume(display);
drm_client_dev_resume(dev);
intel_display_power_enable(display);
intel_gvt_resume(dev_priv);
enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);

22
drivers/gpu/drm/xe/display/xe_display.c
View File

@@ -362,27 +362,7 @@ void xe_display_pm_resume(struct xe_device *xe)
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_pm_resume(display);
intel_display_driver_enable_user_access(display);
drm_kms_helper_poll_enable(&xe->drm);
}
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);
}
static void xe_display_enable_d3cold(struct xe_device *xe)