[Intel-gfx] [PATCH 1/2] drm/i915: follow single notation for workaround number

Rodrigo Vivi rodrigo.vivi at intel.com
Thu Nov 30 00:26:35 UTC 2017


On Wed, Nov 29, 2017 at 11:53:16PM +0000, De Marchi, Lucas wrote:
> On Wed, 2017-11-29 at 15:44 -0800, Rodrigo Vivi wrote:
> > On Tue, Nov 28, 2017 at 09:08:19PM +0000, Lucas De Marchi wrote:
> > > Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/intel_display.c | 2 +-
> > >  drivers/gpu/drm/i915/intel_hdmi.c    | 2 +-
> > >  drivers/gpu/drm/i915/intel_pm.c      | 2 +-
> > >  3 files changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/intel_display.c
> > > b/drivers/gpu/drm/i915/intel_display.c
> > > index 76c75d34e799..9a0ebf205435 100644
> > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > @@ -15126,7 +15126,7 @@ get_encoder_power_domains(struct drm_i915_private
> > > *dev_priv)
> > >  
> > >  static void intel_early_display_was(struct drm_i915_private *dev_priv)
> > >  {
> > > -	/* Display WA #1185 WaDisableDARBFClkGating:cnl,glk */
> > > +	/* Display WA #1185 WaDisableDARBFClkGating: cnl,glk */
> > 
> > If you introduce the space here I believe this patch will need to get
> > bigger.
> > probably to just leave without it.
> 
> Not from my grep.  The ones that don't have space are the ones that don't have
> numbers either. Of course we could just ignore this and allow to either have
> spaces or not.
> 
> git grep -e "Wa[A-Z]" -- drivers/gpu/drm/i915/
> 

Well, using this I see

$ git grep -e "Wa[A-Z]" -- drivers/gpu/drm/i915/ | wc -l
235

where only
$ git grep -e "Wa[A-Z]" -- drivers/gpu/drm/i915/ | grep ": " | wc -l
9

have space.

So maybe it would be good to convert those 9 to match the most used style,
i.e., no space.

Not that I have a strong preference actually. As far as we have the information
about the platform, WaStrangeNameWhenTheyExist, and Display WA #<number>, I'm ok with it,
no matter order or spaces ;)

> vs
> 
> git grep -i -e "WA \#" -- drivers/gpu/drm/i915/
> 
> 
> ... and this last one shows I forgot one case in
> drivers/gpu/drm/i915/intel_pm.c

so, if you insist on this format with space for the displays one I ack the v2 ;)

> 
> 
> Lucas De Marchi
> 
> > 
> > >  	if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
> > >  		I915_WRITE(GEN9_CLKGATE_DIS_0,
> > > I915_READ(GEN9_CLKGATE_DIS_0) |
> > >  			   DARBF_GATING_DIS);
> > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
> > > b/drivers/gpu/drm/i915/intel_hdmi.c
> > > index 9d5e72728475..691600ce48c4 100644
> > > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > > @@ -1380,7 +1380,7 @@ static bool hdmi_12bpc_possible(const struct
> > > intel_crtc_state *crtc_state)
> > >  		}
> > >  	}
> > >  
> > > -	/* Display Wa #1139 */
> > > +	/* Display WA #1139 */
> > 
> > maybe good to add the affected platforms here as well?
> > 
> > >  	if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
> > >  	    crtc_state->base.adjusted_mode.htotal > 5460)
> > >  		return false;
> > > diff --git a/drivers/gpu/drm/i915/intel_pm.c
> > > b/drivers/gpu/drm/i915/intel_pm.c
> > > index a80c322c5b43..7905b8313e40 100644
> > > --- a/drivers/gpu/drm/i915/intel_pm.c
> > > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > > @@ -61,7 +61,7 @@ static void gen9_init_clock_gating(struct
> > > drm_i915_private *dev_priv)
> > >  	if (HAS_LLC(dev_priv)) {
> > >  		/*
> > >  		 * WaCompressedResourceDisplayNewHashMode:skl,kbl
> > > -		 * Display WA#0390: skl,kbl
> > > +		 * Display WA #0390: skl,kbl
> > >  		 *
> > >  		 * Must match Sampler, Pixel Back End, and Media. See
> > >  		 * WaCompressedResourceSamplerPbeMediaNewHashMode.
> > > -- 
> > > 2.14.3
> > > 
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx


More information about the Intel-gfx mailing list