Merge drm/drm-next into drm-intel-next

Sync up with v6.2-rc1.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc drivers/gpu/drm/i915/Makefile
Simple merge

diff --cc drivers/gpu/drm/i915/i915_driver.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
index 05b84196216c43c90149e14729ff1c40fcebc5b6,a380db36d52c40e21da78a834bc6b442f857e518..360743a8a1636a44b037a1fbb925fcc8ebb7a1c5
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -727,10 -722,10 +724,14 @@@ IS_SUBPLATFORM(const struct drm_i915_pr
  #define IS_XEHPSDV_GRAPHICS_STEP(__i915, since, until) \
        (IS_XEHPSDV(__i915) && IS_GRAPHICS_STEP(__i915, since, until))
  
+ #define IS_MTL_GRAPHICS_STEP(__i915, variant, since, until) \
+       (IS_SUBPLATFORM(__i915, INTEL_METEORLAKE, INTEL_SUBPLATFORM_##variant) && \
+        IS_GRAPHICS_STEP(__i915, since, until))
+ 
 +#define IS_MTL_DISPLAY_STEP(__i915, since, until) \
 +      (IS_METEORLAKE(__i915) && \
 +       IS_DISPLAY_STEP(__i915, since, until))
 +
  /*
   * DG2 hardware steppings are a bit unusual.  The hardware design was forked to
   * create three variants (G10, G11, and G12) which each have distinct

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_pci.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge