Commit b1aa0491 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Simona Vetter
Browse files

drm/xe: Fix merge fails related to display runtime PM 

The most recent merge commits introduced some fails to drm/drm-next,
I've noticed these when looking at the xe patches.

Solve it!

Fixes: 8bdb468d ("Merge tag 'drm-xe-next-2024-08-28' of https://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next")
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
[sima: add fixes line, and drop 3rd hunk because that's just a bugfix,
not mismerge, which should go in seperately with proper fixes line and
review/testing.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20240902112002.489225-1-maarten.lankhorst@linux.intel.com
parent 6d0ebb39

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

+0 −2
Original line number Diff line number Diff line
@@ -341,8 +341,6 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime) 


	xe_display_flush_cleanup_work(xe);



	xe_display_flush_cleanup_work(xe);



	intel_dp_mst_suspend(xe);



	intel_hpd_cancel_work(xe);

drivers/gpu/drm/xe/xe_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -392,8 +392,6 @@ int xe_pm_runtime_suspend(struct xe_device *xe) 
	xe_display_pm_runtime_suspend(xe);



	if (xe->d3cold.allowed) {

		xe_display_pm_suspend(xe, true);



		err = xe_bo_evict_all(xe);

		if (err)

			goto out;