public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Oscar Mateo <oscar.mateo@intel.com>, intel-gfx@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [PATCH] drm/i915: Transform WaInPlaceDecompressionHang to a simple reg write
Date: Thu, 07 Sep 2017 12:30:10 +0300	[thread overview]
Message-ID: <87pob23lgd.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <cda4e694-7958-cfe4-4b28-77060b48ec74@intel.com>

Oscar Mateo <oscar.mateo@intel.com> writes:

> Hey Mika,
>
> Regarding this patch: is there a consensus on where is the most 
> appropriate place to apply workarounds? My understanding is that 
> per-context workarounds (WAS_SET_BIT, etc...) go in 
> xxx_init_workarounds, while those that are needed only during 
> initialization (I915_WRITE) go in xxx_init_clock_gating. But it doesn't 
> look like this general rule is being followed (probably because 
> xxx_init_clock_gating is a very misleading name?).
>
> This has probably been discussed before, so it would be good if we could 
> document the answer somewhere (maybe it already is?).
>

Yep, xxx_init_workarounds for per context. init_clock_gating for
globals.

If I recall init_clock_gating was a just suitable spot wrt
to init/reset to inject globals.

Have we reached the pain treshold and move to genx_workarounds.c
where there are per context and global entries?

-Mika

> Thanks,
>
> Oscar
>
>
>
> On 09/06/2017 02:12 PM, Oscar Mateo wrote:
>> Afaict, GEN9_GAMT_ECO_REG_RW_IA does not live in the context, so writing
>> it on every context creation is overkill (and wrong).
>>
>> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
>> ---
>>   drivers/gpu/drm/i915/intel_engine_cs.c | 25 +++++++++++++++----------
>>   1 file changed, 15 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
>> index 23812ec..9f01a5c 100644
>> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
>> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
>> @@ -985,8 +985,9 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
>>   
>>   	/* WaInPlaceDecompressionHang:skl */
>>   	if (IS_SKL_REVID(dev_priv, SKL_REVID_H0, REVID_FOREVER))
>> -		WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
>> -			   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>> +		I915_WRITE(GEN9_GAMT_ECO_REG_RW_IA,
>> +			   (I915_READ(GEN9_GAMT_ECO_REG_RW_IA) |
>> +			    GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>>   
>>   	/* WaDisableLSQCROPERFforOCL:skl */
>>   	ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);
>> @@ -1059,8 +1060,9 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
>>   
>>   	/* WaInPlaceDecompressionHang:bxt */
>>   	if (IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER))
>> -		WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
>> -			   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>> +		I915_WRITE(GEN9_GAMT_ECO_REG_RW_IA,
>> +			   (I915_READ(GEN9_GAMT_ECO_REG_RW_IA) |
>> +			    GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>>   
>>   	return 0;
>>   }
>> @@ -1089,8 +1091,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)
>>   				  GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE);
>>   
>>   	/* WaInPlaceDecompressionHang:cnl */
>> -	WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
>> -		   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>> +	I915_WRITE(GEN9_GAMT_ECO_REG_RW_IA,
>> +		   (I915_READ(GEN9_GAMT_ECO_REG_RW_IA) |
>> +		    GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>>   
>>   	/* WaPushConstantDereferenceHoldDisable:cnl */
>>   	WA_SET_BIT(GEN7_ROW_CHICKEN2, PUSH_CONSTANT_DEREF_DISABLE);
>> @@ -1143,8 +1146,9 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)
>>   		GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
>>   
>>   	/* WaInPlaceDecompressionHang:kbl */
>> -	WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
>> -		   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>> +	I915_WRITE(GEN9_GAMT_ECO_REG_RW_IA,
>> +		   (I915_READ(GEN9_GAMT_ECO_REG_RW_IA) |
>> +		    GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>>   
>>   	/* WaDisableLSQCROPERFforOCL:kbl */
>>   	ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);
>> @@ -1196,8 +1200,9 @@ static int cfl_init_workarounds(struct intel_engine_cs *engine)
>>   		GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
>>   
>>   	/* WaInPlaceDecompressionHang:cfl */
>> -	WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
>> -		   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>> +	I915_WRITE(GEN9_GAMT_ECO_REG_RW_IA,
>> +		   (I915_READ(GEN9_GAMT_ECO_REG_RW_IA) |
>> +		    GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
>>   
>>   	return 0;
>>   }
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2017-09-07  9:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-06 21:12 [PATCH] drm/i915: Transform WaInPlaceDecompressionHang to a simple reg write Oscar Mateo
2017-09-06 21:17 ` Oscar Mateo
2017-09-07  9:30   ` Mika Kuoppala [this message]
2017-09-07 15:50     ` Oscar Mateo
2017-09-06 21:19 ` Chris Wilson
2017-09-06 21:27   ` Oscar Mateo
2017-09-06 21:43     ` Chris Wilson
2017-09-06 21:51       ` Oscar Mateo
2017-09-07 11:54         ` Ville Syrjälä
2017-09-08  7:15           ` Daniel Vetter
2017-09-06 21:58 ` ✗ Fi.CI.BAT: failure for " 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=87pob23lgd.fsf@gaia.fi.intel.com \
    --to=mika.kuoppala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=oscar.mateo@intel.com \
    --cc=rodrigo.vivi@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