mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

drm/i915: rename DISP_STEPPING->DISPLAY_STEP and GT_STEPPING->GT_STEP

Browse source 
Matter of taste. STEP matches the enums.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/cf2dccd1c9c7fdcf5de08ea10a9265292b45d8c7.1616764798.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2021-03-26 15:21:36 +02:00
parent 34b7e27b88
commit cd0fcf5af7
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_display_power.c
View file

@ -5333,7 +5333,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)
if (IS_ALDERLAKE_S(dev_priv) || if (IS_ALDERLAKE_S(dev_priv) ||
IS_DG1_REVID(dev_priv, DG1_REVID_A0, DG1_REVID_A0) || IS_DG1_REVID(dev_priv, DG1_REVID_A0, DG1_REVID_A0) ||
IS_TGL_DISP_STEPPING(dev_priv, STEP_A0, STEP_B0)) IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
/* Wa_1409767108:tgl,dg1,adl-s */ /* Wa_1409767108:tgl,dg1,adl-s */
table = wa_1409767108_buddy_page_masks; table = wa_1409767108_buddy_page_masks;
else else

4
drivers/gpu/drm/i915/display/intel_psr.c
View file

@ -548,7 +548,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)
if (intel_dp->psr.psr2_sel_fetch_enabled) { if (intel_dp->psr.psr2_sel_fetch_enabled) {
/* WA 1408330847 */ /* WA 1408330847 */
if (IS_TGL_DISP_STEPPING(dev_priv, STEP_A0, STEP_A0) || if (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0) ||
IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0)) IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0))
intel_de_rmw(dev_priv, CHICKEN_PAR1_1, intel_de_rmw(dev_priv, CHICKEN_PAR1_1,
DIS_RAM_BYPASS_PSR2_MAN_TRACK, DIS_RAM_BYPASS_PSR2_MAN_TRACK,
@ -1109,7 +1109,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
/* WA 1408330847 */ /* WA 1408330847 */
if (intel_dp->psr.psr2_sel_fetch_enabled && if (intel_dp->psr.psr2_sel_fetch_enabled &&
(IS_TGL_DISP_STEPPING(dev_priv, STEP_A0, STEP_A0) || (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0) ||
IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0))) IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0)))
intel_de_rmw(dev_priv, CHICKEN_PAR1_1, intel_de_rmw(dev_priv, CHICKEN_PAR1_1,
DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0); DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0);

2
drivers/gpu/drm/i915/display/skl_universal_plane.c
View file

@ -1858,7 +1858,7 @@ static bool gen12_plane_supports_mc_ccs(struct drm_i915_private *dev_priv,
{ {
/* Wa_14010477008:tgl[a0..c0],rkl[all],dg1[all] */ /* Wa_14010477008:tgl[a0..c0],rkl[all],dg1[all] */
if (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv) || if (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv) ||
IS_TGL_DISP_STEPPING(dev_priv, STEP_A0, STEP_C0)) IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_C0))
return false; return false;
return plane_id < PLANE_SPRITE4; return plane_id < PLANE_SPRITE4;

10
drivers/gpu/drm/i915/gt/intel_workarounds.c
View file

@ -1093,19 +1093,19 @@ tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
gen12_gt_workarounds_init(i915, wal); gen12_gt_workarounds_init(i915, wal);
/* Wa_1409420604:tgl */ /* Wa_1409420604:tgl */
if (IS_TGL_UY_GT_STEPPING(i915, STEP_A0, STEP_A0)) if (IS_TGL_UY_GT_STEP(i915, STEP_A0, STEP_A0))
wa_write_or(wal, wa_write_or(wal,
SUBSLICE_UNIT_LEVEL_CLKGATE2, SUBSLICE_UNIT_LEVEL_CLKGATE2,
CPSSUNIT_CLKGATE_DIS); CPSSUNIT_CLKGATE_DIS);
/* Wa_1607087056:tgl also know as BUG:1409180338 */ /* Wa_1607087056:tgl also know as BUG:1409180338 */
if (IS_TGL_UY_GT_STEPPING(i915, STEP_A0, STEP_A0)) if (IS_TGL_UY_GT_STEP(i915, STEP_A0, STEP_A0))
wa_write_or(wal, wa_write_or(wal,
SLICE_UNIT_LEVEL_CLKGATE, SLICE_UNIT_LEVEL_CLKGATE,
L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS); L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS);
/* Wa_1408615072:tgl[a0] */ /* Wa_1408615072:tgl[a0] */
if (IS_TGL_UY_GT_STEPPING(i915, STEP_A0, STEP_A0)) if (IS_TGL_UY_GT_STEP(i915, STEP_A0, STEP_A0))
wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2, wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2,
VSUNIT_CLKGATE_DIS_TGL); VSUNIT_CLKGATE_DIS_TGL);
} }
@ -1583,7 +1583,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
struct drm_i915_private *i915 = engine->i915; struct drm_i915_private *i915 = engine->i915;
if (IS_DG1_REVID(i915, DG1_REVID_A0, DG1_REVID_A0) || if (IS_DG1_REVID(i915, DG1_REVID_A0, DG1_REVID_A0) ||
IS_TGL_UY_GT_STEPPING(i915, STEP_A0, STEP_A0)) { IS_TGL_UY_GT_STEP(i915, STEP_A0, STEP_A0)) {
/* /*
* Wa_1607138336:tgl[a0],dg1[a0] * Wa_1607138336:tgl[a0],dg1[a0]
* Wa_1607063988:tgl[a0],dg1[a0] * Wa_1607063988:tgl[a0],dg1[a0]
@ -1593,7 +1593,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
GEN12_DISABLE_POSH_BUSY_FF_DOP_CG); GEN12_DISABLE_POSH_BUSY_FF_DOP_CG);
} }
if (IS_TGL_UY_GT_STEPPING(i915, STEP_A0, STEP_A0)) { if (IS_TGL_UY_GT_STEP(i915, STEP_A0, STEP_A0)) {
/* /*
* Wa_1606679103:tgl * Wa_1606679103:tgl
* (see also Wa_1606682166:icl) * (see also Wa_1606682166:icl)

10
drivers/gpu/drm/i915/i915_drv.h
View file

@ -1502,15 +1502,15 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
#define IS_JSL_EHL_REVID(p, since, until) \ #define IS_JSL_EHL_REVID(p, since, until) \
(IS_JSL_EHL(p) && IS_REVID(p, since, until)) (IS_JSL_EHL(p) && IS_REVID(p, since, until))
#define IS_TGL_DISP_STEPPING(__i915, since, until) \ #define IS_TGL_DISPLAY_STEP(__i915, since, until) \
(IS_TIGERLAKE(__i915) && \ (IS_TIGERLAKE(__i915) && \
IS_DISPLAY_STEP(__i915, since, until)) IS_DISPLAY_STEP(__i915, since, until))
#define IS_TGL_UY_GT_STEPPING(__i915, since, until) \ #define IS_TGL_UY_GT_STEP(__i915, since, until) \
((IS_TGL_U(__i915) || IS_TGL_Y(__i915)) && \ ((IS_TGL_U(__i915) || IS_TGL_Y(__i915)) && \
IS_GT_STEP(__i915, since, until)) IS_GT_STEP(__i915, since, until))
#define IS_TGL_GT_STEPPING(__i915, since, until) \ #define IS_TGL_GT_STEP(__i915, since, until) \
(IS_TIGERLAKE(__i915) && !(IS_TGL_U(__i915) || IS_TGL_Y(__i915)) && \ (IS_TIGERLAKE(__i915) && !(IS_TGL_U(__i915) || IS_TGL_Y(__i915)) && \
IS_GT_STEP(__i915, since, until)) IS_GT_STEP(__i915, since, until))
@ -1527,11 +1527,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
#define IS_DG1_REVID(p, since, until) \ #define IS_DG1_REVID(p, since, until) \
(IS_DG1(p) && IS_REVID(p, since, until)) (IS_DG1(p) && IS_REVID(p, since, until))
#define IS_ADLS_DISP_STEPPING(__i915, since, until) \ #define IS_ADLS_DISPLAY_STEP(__i915, since, until) \
(IS_ALDERLAKE_S(__i915) && \ (IS_ALDERLAKE_S(__i915) && \
IS_DISPLAY_STEP(__i915, since, until)) IS_DISPLAY_STEP(__i915, since, until))
#define IS_ADLS_GT_STEPPING(__i915, since, until) \ #define IS_ADLS_GT_STEP(__i915, since, until) \
(IS_ALDERLAKE_S(__i915) && \ (IS_ALDERLAKE_S(__i915) && \
IS_GT_STEP(__i915, since, until)) IS_GT_STEP(__i915, since, until))

2
drivers/gpu/drm/i915/intel_device_info.c
View file

@ -251,7 +251,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
enum pipe pipe; enum pipe pipe;
/* Wa_14011765242: adl-s A0 */ /* Wa_14011765242: adl-s A0 */
if (IS_ADLS_DISP_STEPPING(dev_priv, STEP_A0, STEP_A0)) if (IS_ADLS_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0))
for_each_pipe(dev_priv, pipe) for_each_pipe(dev_priv, pipe)
runtime->num_scalers[pipe] = 0; runtime->num_scalers[pipe] = 0;
else if (INTEL_GEN(dev_priv) >= 10) { else if (INTEL_GEN(dev_priv) >= 10) {

2
drivers/gpu/drm/i915/intel_pm.c
View file

@ -7134,7 +7134,7 @@ static void gen12lp_init_clock_gating(struct drm_i915_private *dev_priv)
ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL); ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
/* Wa_1409825376:tgl (pre-prod)*/ /* Wa_1409825376:tgl (pre-prod)*/
if (IS_TGL_DISP_STEPPING(dev_priv, STEP_A0, STEP_B1)) if (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B1))
intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) | intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) |
TGL_VRH_GATING_DIS); TGL_VRH_GATING_DIS);