| Message ID | 20241022080943.763580-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [drm-intel-next] drm/xe: fix build failure originating from backmerge | expand |
On 22/10/2024 09:09, Jani Nikula wrote: > ../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 [-Werror=incompatible-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); > | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ > > Fixes: c141cf76918e ("Merge drm/drm-next into drm-intel-next") > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Matthew Auld <matthew.auld@intel.com> > --- > 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)
On Tue, 22 Oct 2024, Matthew Auld <matthew.auld@intel.com> wrote: > On 22/10/2024 09:09, Jani Nikula wrote: >> ../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 [-Werror=incompatible-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); >> | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ >> >> Fixes: c141cf76918e ("Merge drm/drm-next into drm-intel-next") >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > Acked-by: Matthew Auld <matthew.auld@intel.com> Thanks, pushed to din. BR, Jani. > > >> --- >> 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)
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)
../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 [-Werror=incompatible-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); | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ Fixes: c141cf76918e ("Merge drm/drm-next into drm-intel-next") Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/xe/display/xe_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)