Commit dcb6c1d0 authored by Imre Deak's avatar Imre Deak Committed by Lucas De Marchi
Browse files

drm/xe/display: Separate the d3cold and non-d3cold runtime PM handling 



For clarity separate the d3cold and non-d3cold runtime PM handling. The
only change in behavior is disabling polling later during runtime
resume. This shouldn't make a difference, since the poll disabling is
handled from a work, which could run at any point wrt. the runtime
resume handler. The work will also require a runtime PM reference,
syncing it with the resume handler.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241009194358.1321200-4-imre.deak@intel.com


(cherry picked from commit a4de6beb)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 25f2ff53

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

+14 −5
Original line number Diff line number Diff line
@@ -342,6 +342,9 @@ static void __xe_display_pm_suspend(struct xe_device *xe, bool runtime) 
	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);



	intel_dmc_suspend(xe);



	if (runtime && has_display(xe))

		intel_hpd_poll_enable(xe);

}



void xe_display_pm_suspend(struct xe_device *xe)
@@ -354,8 +357,10 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe) 
	if (!xe->info.probe_display)

		return;



	if (xe->d3cold.allowed)

	if (xe->d3cold.allowed) {

		__xe_display_pm_suspend(xe, true);

		return;

	}



	intel_hpd_poll_enable(xe);

}
@@ -405,9 +410,11 @@ static void __xe_display_pm_resume(struct xe_device *xe, bool runtime) 
		intel_display_driver_resume(xe);

		drm_kms_helper_poll_enable(&xe->drm);

		intel_display_driver_enable_user_access(xe);

		intel_hpd_poll_disable(xe);

	}



	if (has_display(xe))

		intel_hpd_poll_disable(xe);



	intel_opregion_resume(display);



	intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_RUNNING, false);
@@ -425,10 +432,12 @@ void xe_display_pm_runtime_resume(struct xe_device *xe) 
	if (!xe->info.probe_display)

		return;



	intel_hpd_poll_disable(xe);



	if (xe->d3cold.allowed)

	if (xe->d3cold.allowed) {

		__xe_display_pm_resume(xe, true);

		return;

	}



	intel_hpd_poll_disable(xe);

}