public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 6/7] drm/i915: rename DISP_STEPPING->DISPLAY_STEP and GT_STEPPING->GT_STEP
Date: Wed, 24 Feb 2021 10:46:55 +0200	[thread overview]
Message-ID: <87tuq1etts.fsf@intel.com> (raw)
In-Reply-To: <20210224015455.4z2mhbtmeofzelxj@ldmartin-desk1>

On Tue, 23 Feb 2021, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Tue, Feb 23, 2021 at 05:35:11PM +0200, Jani Nikula wrote:
>>Matter of taste. STEP matches the enums.
>>
>>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>---
>> drivers/gpu/drm/i915/display/intel_display_power.c |  2 +-
>> drivers/gpu/drm/i915/display/intel_psr.c           |  4 ++--
>> drivers/gpu/drm/i915/display/skl_universal_plane.c |  2 +-
>> drivers/gpu/drm/i915/gt/intel_workarounds.c        | 10 +++++-----
>> drivers/gpu/drm/i915/i915_drv.h                    | 10 +++++-----
>> drivers/gpu/drm/i915/intel_device_info.c           |  2 +-
>> drivers/gpu/drm/i915/intel_pm.c                    |  2 +-
>> 7 files changed, 16 insertions(+), 16 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
>>index f00c1750febd..1f7b2700947a 100644
>>--- a/drivers/gpu/drm/i915/display/intel_display_power.c
>>+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
>>@@ -5349,7 +5349,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)
>>
>> 	if (IS_ALDERLAKE_S(dev_priv) ||
>> 	    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 */
>> 		table = wa_1409767108_buddy_page_masks;
>> 	else
>>diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
>>index 7c6e561f86c1..da5084b54eb6 100644
>>--- a/drivers/gpu/drm/i915/display/intel_psr.c
>>+++ b/drivers/gpu/drm/i915/display/intel_psr.c
>>@@ -548,7 +548,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)
>>
>> 	if (intel_dp->psr.psr2_sel_fetch_enabled) {
>> 		/* WA 1408330847 */
>>-		if (IS_TGL_DISP_STEPPING(dev_priv, STEP_A0, STEP_A0) ||
>>+		if (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0) ||
>
> I always hated the DISP vs DISPLAY. It should be in the commit message.
>
> But if you are doing the s/STEPPING/STEP/, shouldn't the filename also use
> step and all the functions/structs?

To be honest, the rename came as an afterthought, after Aditya (I think)
added the STEP_X enums.

For me step everywhere sounds good, I wonder what the native speakers
think.


BR,
Jani.


>
> Lucas De Marchi
>
>> 		    IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0))
>> 			intel_de_rmw(dev_priv, CHICKEN_PAR1_1,
>> 				     DIS_RAM_BYPASS_PSR2_MAN_TRACK,
>>@@ -1103,7 +1103,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
>>
>> 	/* WA 1408330847 */
>> 	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)))
>> 		intel_de_rmw(dev_priv, CHICKEN_PAR1_1,
>> 			     DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0);
>>diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>>index 1f335cb09149..c4edfc673d47 100644
>>--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
>>+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>>@@ -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] */
>> 	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 plane_id < PLANE_SPRITE4;
>>diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
>>index 0c502a733779..4f8f9fbf6619 100644
>>--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
>>+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
>>@@ -1091,19 +1091,19 @@ tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
>> 	gen12_gt_workarounds_init(i915, wal);
>>
>> 	/* 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,
>> 			    SUBSLICE_UNIT_LEVEL_CLKGATE2,
>> 			    CPSSUNIT_CLKGATE_DIS);
>>
>> 	/* 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,
>> 			    SLICE_UNIT_LEVEL_CLKGATE,
>> 			    L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS);
>>
>> 	/* 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,
>> 			    VSUNIT_CLKGATE_DIS_TGL);
>> }
>>@@ -1581,7 +1581,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
>> 	struct drm_i915_private *i915 = engine->i915;
>>
>> 	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_1607063988:tgl[a0],dg1[a0]
>>@@ -1591,7 +1591,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
>> 			    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
>> 		 * (see also Wa_1606682166:icl)
>>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>>index 2d2ebf284e64..927a32427197 100644
>>--- a/drivers/gpu/drm/i915/i915_drv.h
>>+++ b/drivers/gpu/drm/i915/i915_drv.h
>>@@ -1510,15 +1510,15 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
>> #define IS_JSL_EHL_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_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_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_GT_STEP(__i915, since, until))
>>
>>@@ -1535,11 +1535,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
>> #define IS_DG1_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_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_GT_STEP(__i915, since, until))
>>
>>diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>>index aeb28d589b2b..de02207f6ec6 100644
>>--- a/drivers/gpu/drm/i915/intel_device_info.c
>>+++ b/drivers/gpu/drm/i915/intel_device_info.c
>>@@ -251,7 +251,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
>> 	enum pipe pipe;
>>
>> 	/* 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)
>> 			runtime->num_scalers[pipe] = 0;
>> 	else if (INTEL_GEN(dev_priv) >= 10) {
>>diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>>index dbf87892193a..e16f5e498a86 100644
>>--- a/drivers/gpu/drm/i915/intel_pm.c
>>+++ b/drivers/gpu/drm/i915/intel_pm.c
>>@@ -7070,7 +7070,7 @@ static void gen12lp_init_clock_gating(struct drm_i915_private *dev_priv)
>> 			   ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
>>
>> 	/* 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) |
>> 			   TGL_VRH_GATING_DIS);
>>
>>-- 
>>2.20.1
>>

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2021-02-24  8:47 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-23 15:35 [Intel-gfx] [PATCH v2 0/7] drm/i915: refactor KBL/TGL/ADLS stepping scheme Jani Nikula
2021-02-23 15:35 ` [Intel-gfx] [PATCH v2 1/7] drm/i915: remove unused ADLS_REVID_* macros Jani Nikula
2021-02-24  1:47   ` Lucas De Marchi
2021-02-23 15:35 ` [Intel-gfx] [PATCH v2 2/7] drm/i915: split out stepping info to a new file Jani Nikula
2021-02-23 15:35 ` [Intel-gfx] [PATCH v2 3/7] drm/i915: add new helpers for accessing stepping info Jani Nikula
2021-02-23 15:35 ` [Intel-gfx] [PATCH v2 4/7] drm/i915: switch KBL to the new stepping scheme Jani Nikula
2021-02-23 15:35 ` [Intel-gfx] [PATCH v2 5/7] drm/i915: switch TGL and ADL " Jani Nikula
2021-02-23 15:35 ` [Intel-gfx] [PATCH v2 6/7] drm/i915: rename DISP_STEPPING->DISPLAY_STEP and GT_STEPPING->GT_STEP Jani Nikula
2021-02-24  1:54   ` Lucas De Marchi
2021-02-24  8:46     ` Jani Nikula [this message]
2021-03-05 10:19       ` Chris Wilson
2021-02-23 15:35 ` [Intel-gfx] [PATCH v2 7/7] drm/i915: rename disp_stepping->display_step and gt_stepping->gt_step Jani Nikula
2021-02-24  9:38 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: refactor KBL/TGL/ADLS stepping scheme Patchwork
2021-02-24 10:08 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-02-24 11:58 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87tuq1etts.fsf@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=lucas.demarchi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox