From: Matt Roper Date: Thu, 15 Jul 2021 00:54:25 +0000 (-0700) Subject: Merge branch 'topic/revid_steppings' into drm-intel-gt-next X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=d6e6ac294d91563131265fdf44537aeac2984c21;p=kernel.git 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 --- d6e6ac294d91563131265fdf44537aeac2984c21 diff --cc drivers/gpu/drm/i915/display/intel_dpll_mgr.c index 882bfd499e55e,9b5324d015ec7..dfc31b6828484 --- a/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_workarounds.c index 72562c233ad20,2d531b43475c3..7731db33c46a3 --- a/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);