Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Wed, 31 May 2023 09:01:51 +0000 (12:01 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 31 May 2023 09:01:51 +0000 (12:01 +0300)
commite2a9f0a32464f435dbdb190ff7dbf09745703b60
treebae874fad606918fdae32a99a2b47a76f3a605b3
parent3e36c490698660ba4fa7cedfab03f3ed81a07192
parent85d712f033d23bb56a373e29465470c036532d46
Merge drm/drm-next into drm-intel-next

Sync the drm-intel-gt-next changes back to drm-intel-next via drm-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
12 files changed:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/intel_fb.c
drivers/gpu/drm/i915/gt/intel_gt_irq.c
drivers/gpu/drm/i915/gt/intel_gt_regs.h
drivers/gpu/drm/i915/gt/uc/intel_guc.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_hwmon.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_pci.c
drivers/gpu/drm/i915/i915_vma.c
drivers/gpu/drm/i915/intel_device_info.h