]> www.infradead.org Git - users/jedix/linux-maple.git/commit
drm/xe: fix build failure originating from backmerge
authorJani Nikula <jani.nikula@intel.com>
Tue, 22 Oct 2024 08:09:43 +0000 (11:09 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 22 Oct 2024 09:07:38 +0000 (12:07 +0300)
commita081908ba4a534ad0f1961291850b3cba85bdc53
tree58e4fc2015d463b1950ea431ec2f33efd5f03561
parent682c9d3d7abbe07a6dda6ea2cae2bf72a10982cd
drm/xe: fix build failure originating from backmerge

../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>
Acked-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241022080943.763580-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/xe/display/xe_display.c