Hi all, After merging the drm-xe tree, today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/gpu/drm/xe/display/xe_display.c: In function 'xe_display_pm_shutdown':
drivers/gpu/drm/xe/display/xe_display.c:382:27: error: passing argument 1 of
'intel_dmc_suspend' from incompatible pointer type
[-Wincompatible-pointer-types]
382 | intel_dmc_suspend(xe);
| ^~
| |
| struct xe_device *
In file included from drivers/gpu/drm/xe/display/xe_display.c:24:
drivers/gpu/drm/i915/display/intel_dmc.h:22:46: note: expected 'struct
intel_display *' but argument is of type 'struct xe_device *'
22 | void intel_dmc_suspend(struct intel_display *display);
| ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
Caused by commit
501d799a47e2 ("drm/xe: Wire up device shutdown handler")
interacting with commit
5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display")
from the drm-intel tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Tue, 1 Oct 2024 11:30:00 +1000
Subject: [PATCH] fix up for "drm/xe: Wire up device shutdown handler"
interacting with commit
5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display")
from the drm-intel tree.
---
drivers/gpu/drm/xe/display/xe_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/display/xe_display.c
b/drivers/gpu/drm/xe/display/xe_display.c
index 957ae763531d..ca00a365080f 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -379,7 +379,7 @@ void xe_display_pm_shutdown(struct xe_device *xe)
intel_opregion_suspend(display, PCI_D3cold);
- intel_dmc_suspend(xe);
+ intel_dmc_suspend(display);
}
void xe_display_pm_runtime_suspend(struct xe_device *xe)
--
2.45.2
--
Cheers,
Stephen Rothwell
pgpR8gRVLbqcH.pgp
Description: OpenPGP digital signature
