github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 19:43:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/{i915, xe}/display: Move DP MST calls to display_driver

Browse Source 
Move dp_mst suspend/resume functions from the drivers towards
intel_display_driver to continue with the unification.

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241113225016.208673-4-rodrigo.vivi@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Rodrigo Vivi 2024-11-13 17:50:13 -05:00
parent ec803c9b00
commit bd5dd9797d
No known key found for this signature in database
GPG Key ID: FA625F640EEB13CA
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -676,6 +676,9 @@ int intel_display_driver_suspend(struct drm_i915_private *i915)
ret);
else
i915->display.restore.modeset_state = state;
intel_dp_mst_suspend(i915);
return ret;
}
@ -729,6 +732,9 @@ void intel_display_driver_resume(struct drm_i915_private *i915)
if (!HAS_DISPLAY(i915))
return;
/* MST sideband requires HPD interrupts enabled */
intel_dp_mst_resume(i915);
i915->display.restore.modeset_state = NULL;
if (state)
state->acquire_ctx = &ctx;

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

@ -1040,8 +1040,6 @@ static int i915_drm_suspend(struct drm_device *dev)
intel_display_driver_suspend(dev_priv);
intel_dp_mst_suspend(dev_priv);
intel_irq_suspend(dev_priv);
intel_hpd_cancel_work(dev_priv);
@ -1209,8 +1207,6 @@ static int i915_drm_resume(struct drm_device *dev)
intel_hpd_init(dev_priv);
/* MST sideband requires HPD interrupts enabled */
intel_dp_mst_resume(dev_priv);
intel_display_driver_resume(dev_priv);
if (HAS_DISPLAY(dev_priv)) {

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

@ -334,9 +334,6 @@ static void __xe_display_pm_suspend(struct xe_device *xe, bool runtime)
xe_display_flush_cleanup_work(xe);
if (!runtime)
intel_dp_mst_suspend(xe);
intel_hpd_cancel_work(xe);
if (!runtime && has_display(xe)) {
@ -447,10 +444,6 @@ static void __xe_display_pm_resume(struct xe_device *xe, bool runtime)
if (!runtime && has_display(xe))
intel_display_driver_resume_access(xe);
/* MST sideband requires HPD interrupts enabled */
if (!runtime)
intel_dp_mst_resume(xe);
if (!runtime && has_display(xe)) {
intel_display_driver_resume(xe);
drm_kms_helper_poll_enable(&xe->drm);