Merge drm/drm-next into drm-xe-next
authorLucas De Marchi <lucas.demarchi@intel.com>
Fri, 16 Aug 2024 17:05:54 +0000 (10:05 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 16 Aug 2024 17:33:54 +0000 (10:33 -0700)
commited7171ff9fabc49ae6ed42fbd082a576473836fc
tree62bc21b9b590a7fefb27b6103a121f4386e1815f
parentdb3461a7743817ad7c73553902231b096616813a
parenta809b92ee0f84c3f655b16a8b4d04bc3665d954a
Merge drm/drm-next into drm-xe-next

Get drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next for
the display side. This resolves the current conflict for the
enable_display module parameter and allows further pending refactors.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/display/xe_display.c
drivers/gpu/drm/xe/xe_vm.c