Merge branch 'topic/revid_steppings' into drm-intel-gt-next

The switch from old old IS_FOO_REVID() macros to the new table-based
IS_FOO_{GT,DISP}_STEP() macros is needed on both drm-intel-next (for
display-based DMC matching) and drm-intel-gt-next (for workaround
guards).  To avoid conflicts, we'll apply the patches to a topic branch
and merge it to both intel branches to ensure the transition to the
new macros is clean.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

diff --cc drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 882bfd499e55e93340121ad6f1f581509cf0c882,9b5324d015ec7c40fd507e03e3b6bd9c51fad6c4..dfc31b682848440d9014bf6686723cad26cc1af3
--- 1/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
--- 2/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@@ -2674,8 -2674,8 +2674,8 @@@ static boo
  ehl_combo_pll_div_frac_wa_needed(struct drm_i915_private *i915)
  {
        return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) &&
-                IS_JSL_EHL_REVID(i915, EHL_REVID_B0, REVID_FOREVER)) ||
+                IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) ||
 -               IS_TIGERLAKE(i915)) &&
 +               IS_TIGERLAKE(i915) || IS_ALDERLAKE_P(i915)) &&
                 i915->dpll.ref_clks.nssc == 38400;
  }
  

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

diff --cc drivers/gpu/drm/i915/gt/intel_workarounds.c
index 72562c233ad2025e6df275a8f0e1f23ea27c7072,2d531b43475c31aa22712cc06c46ffbec9cfb88e..7731db33c46a3ee3ebf9f0441e1179ec52774c80
--- 1/drivers/gpu/drm/i915/gt/intel_workarounds.c
--- 2/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@@ -1644,10 -1566,10 +1556,10 @@@ rcs_engine_wa_init(struct intel_engine_
                             FF_DOP_CLOCK_GATE_DISABLE);
        }
  
 -      if (IS_ALDERLAKE_S(i915) ||
 +      if (IS_ALDERLAKE_P(i915) || IS_ALDERLAKE_S(i915) ||
-           IS_DG1_REVID(i915, DG1_REVID_A0, DG1_REVID_A0) ||
+           IS_DG1_GT_STEP(i915, STEP_A0, STEP_A0) ||
            IS_ROCKETLAKE(i915) || IS_TIGERLAKE(i915)) {
 -              /* Wa_1409804808:tgl,rkl,dg1[a0],adl-s */
 +              /* Wa_1409804808:tgl,rkl,dg1[a0],adl-s,adl-p */
                wa_masked_en(wal, GEN7_ROW_CHICKEN2,
                             GEN12_PUSH_CONST_DEREF_HOLD_DIS);
  

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

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