Subject: linux-next: manual merge of the drm-intel tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 3 Oct 2023 11:09:57 +1100

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

  drivers/gpu/drm/i915/i915_drv.h

between commits:

  c9517783060a ("drm/i915/dg2: Drop Wa_16011777198")
  5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_STEP")
  81af8abe6513 ("drm/i915: Eliminate IS_MTL_MEDIA_STEP")

from the drm tree and commits:

  e50086f3d313 ("drm/i915/dg2: Drop pre-production display workarounds")
  213454b3af2e ("drm/i915: Eliminate IS_MTL_DISPLAY_STEP")

from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/i915_drv.h
index e994bd2d69db,cc229f08dfdb..000000000000
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -647,21 -653,33 +649,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_DISPLAY_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) \
--	(IS_METEORLAKE(__i915) && \
- 	 IS_DISPLAY_STEP(__i915, since, until))
 -	 IS_MEDIA_STEP(__i915, since, until))
--
- #define IS_DG2_DISPLAY_STEP(__i915, since, until) \
- 	(IS_DG2(__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
 - * 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_PVC_BD_STEP(__i915, since, until) \
  	(IS_PONTEVECCHIO(__i915) && \
  	 IS_BASEDIE_STEP(__i915, since, until))