Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Sat, 10 Jun 2023 07:04:00 +0000 (10:04 +0300)
committerJani Nikula <jani.nikula@intel.com>
Sat, 10 Jun 2023 07:04:00 +0000 (10:04 +0300)
commit69f06e4fa098420e94f6970332e84f0ed493271c
treec5d675bf50b84deb3ccb0522aa85ca1223440339
parent0976b3dc021b2c5392d6abf443460e4208f85fe6
parentba57b9b11f78530146f02b776854b2b6b6d344a4
Merge drm/drm-next into drm-intel-next

Sync up with changes from drm-intel-gt-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_fbdev.c
drivers/gpu/drm/i915/i915_driver.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_reg.h