diff mbox

drm/i915:gen9: restrict WaC6DisallowByGfxPause

Message ID 1468590566-14951-1-git-send-email-tim.gore@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

tim.gore@intel.com July 15, 2016, 1:49 p.m. UTC 
From: Tim Gore <tim.gore@intel.com>

WaC6DisallowByGfxPause is currently applied unconditionally
but is not required in all revisions.

References: HSD#2133391
Signed-off-by: Tim Gore <tim.gore@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

sagar.a.kamble@intel.com July 19, 2016, 6:56 a.m. UTC | #1 
On 7/15/2016 7:19 PM, tim.gore@intel.com wrote:
> From: Tim Gore <tim.gore@intel.com>
>
> WaC6DisallowByGfxPause is currently applied unconditionally
> but is not required in all revisions.
>
> References: HSD#2133391
> Signed-off-by: Tim Gore <tim.gore@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_guc_loader.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 605c696..173dcef 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -349,7 +349,9 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
>   	}
>   
>   	/* WaC6DisallowByGfxPause*/
> -	I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
> +	if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
> +	    IS_BXT_REVID(dev, 0, BXT_REVID_A1))
I see this is applicable till BXT B0 and SKL C0 in wa_database. Am I 
missing something?
> +		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
>   
>   	if (IS_BROXTON(dev))
>   		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
tim.gore@intel.com July 19, 2016, 9:56 a.m. UTC | #2 
Tim Gore 
Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ

> -----Original Message-----
> From: Kamble, Sagar A
> Sent: Tuesday, July 19, 2016 7:56 AM
> To: Gore, Tim
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH] drm/i915:gen9: restrict
> WaC6DisallowByGfxPause
> 
> 
> 
> On 7/15/2016 7:19 PM, tim.gore@intel.com wrote:
> > From: Tim Gore <tim.gore@intel.com>
> >
> > WaC6DisallowByGfxPause is currently applied unconditionally but is not
> > required in all revisions.
> >
> > References: HSD#2133391
> > Signed-off-by: Tim Gore <tim.gore@intel.com>
> > ---
> >   drivers/gpu/drm/i915/intel_guc_loader.c | 4 +++-
> >   1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> > b/drivers/gpu/drm/i915/intel_guc_loader.c
> > index 605c696..173dcef 100644
> > --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> > @@ -349,7 +349,9 @@ static int guc_ucode_xfer(struct drm_i915_private
> *dev_priv)
> >   	}
> >
> >   	/* WaC6DisallowByGfxPause*/
> > -	I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
> > +	if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
> > +	    IS_BXT_REVID(dev, 0, BXT_REVID_A1))
> I see this is applicable till BXT B0 and SKL C0 in wa_database. Am I missing
> something?

  The HSD (ref'd above) indicates that this problem is fixed in Bxt B0 and Skl C0.
I wasn't sure whether to follow the HSD or prior art.?

> > +		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
> >
> >   	if (IS_BROXTON(dev))
> >   		I915_WRITE(GEN9LP_GT_PM_CONFIG,
> GT_DOORBELL_ENABLE);
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 605c696..173dcef 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -349,7 +349,9 @@  static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
 	}
 
 	/* WaC6DisallowByGfxPause*/
-	I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
+	if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
+	    IS_BXT_REVID(dev, 0, BXT_REVID_A1))
+		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);
 
 	if (IS_BROXTON(dev))
 		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);