From: Jani Nikula <jani.nikula@intel.com>
Date: Wed, 4 Oct 2023 15:06:27 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: io_uring-6.7-2023-11-10~63^2~13^2~49
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7824a88b4286980512de2a46763646100274a5ac;p=linux-block.git

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

Backmerge to sync up with drm-intel-gt-next and drm-misc-next.

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

7824a88b4286980512de2a46763646100274a5ac
diff --cc drivers/gpu/drm/i915/i915_drv.h
index e4d791ad6751,ea92a00353da..da2217c16153
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -645,33 -647,21 +641,6 @@@ 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_MEDIA_STEP(__i915, since, until) \
 -#define IS_MTL_DISPLAY_STEP(__i915, since, until) \
--	(IS_METEORLAKE(__i915) && \
- 	 IS_MEDIA_STEP(__i915, since, until))
 -	 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
-  * workaround sets.  The G11 and G12 forks of the DG2 design reset the GT
-  * stepping back to "A0" for their first iterations, even though they're more
-  * similar to a G10 B0 stepping and G10 C0 stepping respectively in terms of
-  * functionality and workarounds.  However the display stepping does not reset
-  * in the same manner --- a specific stepping like "B0" has a consistent
-  * meaning regardless of whether it belongs to a G10, G11, or G12 DG2.
-  *
-  * TLDR:  All GT workarounds and stepping-specific logic must be applied in
-  * relation to a specific subplatform (G10/G11/G12), whereas display workarounds
-  * and stepping-specific logic will be applied with a general DG2-wide stepping
-  * number.
-  */
- #define IS_DG2_GRAPHICS_STEP(__i915, variant, since, until) \
- 	(IS_SUBPLATFORM(__i915, INTEL_DG2, INTEL_SUBPLATFORM_##variant) && \
- 	 IS_GRAPHICS_STEP(__i915, since, until))
 -#define IS_DG2_DISPLAY_STEP(__i915, since, until) \
 -	(IS_DG2(__i915) && \
 -	 IS_DISPLAY_STEP(__i915, since, until))
--
  #define IS_PVC_BD_STEP(__i915, since, until) \
  	(IS_PONTEVECCHIO(__i915) && \
  	 IS_BASEDIE_STEP(__i915, since, until))