Unverified Commit bd5dd979 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

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



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

Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241113225016.208673-4-rodrigo.vivi@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent ec803c9b

drivers/gpu/drm/i915/display/intel_display_driver.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/i915_driver.c

+0 −4
Original line number Diff line number Diff line
@@ -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)) {

drivers/gpu/drm/xe/display/xe_display.c

+0 −7
Original line number Diff line number Diff line
@@ -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);