Merge drm/drm-next into drm-intel-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 17 Oct 2024 16:52:05 +0000 (12:52 -0400)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 17 Oct 2024 16:52:05 +0000 (12:52 -0400)
commitc141cf76918e25ec7bd433b47590e8c3f3d02542
tree1e3fcb7389980d9471114737f4a01588f56153cb
parentaf4f896f77b30bf6811696dc86fcf61c9daf1c85
parent26bb2dc102783fef49336b26a94563318f9790d3
Merge drm/drm-next into drm-intel-next

Needed to bring some KVM changes to be able to include a fix in our Kconfig.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_dsb.c
drivers/gpu/drm/i915/gem/i915_gem_ttm.c
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
drivers/gpu/drm/xe/display/xe_display.c