tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: 8bdb468dd7a5 ("Merge tag 'drm-xe-next-2024-08-28' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next")
Signed-off-by: Maarten 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: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20240902112002.489225-1-maarten.lankhorst@linux.intel.com

authored by

Maarten Lankhorst and committed by
Daniel Vetter b1aa0491 6d0ebb39

-4
-2
drivers/gpu/drm/xe/display/xe_display.c
··· 341 341 342 342 xe_display_flush_cleanup_work(xe); 343 343 344 - xe_display_flush_cleanup_work(xe); 345 - 346 344 intel_dp_mst_suspend(xe); 347 345 348 346 intel_hpd_cancel_work(xe);
-2
drivers/gpu/drm/xe/xe_pm.c
··· 392 392 xe_display_pm_runtime_suspend(xe); 393 393 394 394 if (xe->d3cold.allowed) { 395 - xe_display_pm_suspend(xe, true); 396 - 397 395 err = xe_bo_evict_all(xe); 398 396 if (err) 399 397 goto out;