Re: [PATCH 1/3] drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code

[Jani Nikula <jani.nikula@linux.intel.com>]

On Wed, 03 Jun 2015, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Tue, 02 Jun 2015, Damien Lespiau <damien.lespiau@intel.com> wrote:
>> On Tue, Jun 02, 2015 at 03:37:35PM +0300, ville.syrjala@linux.intel.com wrote:
>>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>> 
>>>  commit 65ca7514e21adbee25b8175fc909759c735d00ff
>>>  Author: Damien Lespiau <damien.lespiau@intel.com>
>>>  Date:   Mon Feb 9 19:33:22 2015 +0000
>>> 
>>>     drm/i915/skl: Implement WaBarrierPerformanceFixDisable
>>> 
>>> got misapplied and the code landed in chv_init_workarounds() instead of
>>> the intended skl_init_workarounds(). Move it over to the right place.
>>> 
>>> Cc: Damien Lespiau <damien.lespiau@intel.com>
>>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>> ---
>>
>> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
>
> Pushed this one patch to drm-intel-next-queued, thanks for the patch and
> review.

...and cherry-picked to drm-intel-fixes because it affects CHV code.

BR,
Jani.


>
> I presume the r-b was for patch 1 only, any chance you could look at the
> other two, Damien?
>
> BR,
> Jani.
>
>
>
>>
>> -- 
>> Damien
>>
>>>  drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++-------
>>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>> 
>>> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
>>> index d934f85..edd47ba 100644
>>> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
>>> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
>>> @@ -901,13 +901,6 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
>>>  			    GEN6_WIZ_HASHING_MASK,
>>>  			    GEN6_WIZ_HASHING_16x4);
>>>  
>>> -	if (INTEL_REVID(dev) == SKL_REVID_C0 ||
>>> -	    INTEL_REVID(dev) == SKL_REVID_D0)
>>> -		/* WaBarrierPerformanceFixDisable:skl */
>>> -		WA_SET_BIT_MASKED(HDC_CHICKEN0,
>>> -				  HDC_FENCE_DEST_SLM_DISABLE |
>>> -				  HDC_BARRIER_PERFORMANCE_DISABLE);
>>> -
>>>  	return 0;
>>>  }
>>>  
>>> @@ -1041,6 +1034,13 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
>>>  				  HDC_FORCE_NON_COHERENT);
>>>  	}
>>>  
>>> +	if (INTEL_REVID(dev) == SKL_REVID_C0 ||
>>> +	    INTEL_REVID(dev) == SKL_REVID_D0)
>>> +		/* WaBarrierPerformanceFixDisable:skl */
>>> +		WA_SET_BIT_MASKED(HDC_CHICKEN0,
>>> +				  HDC_FENCE_DEST_SLM_DISABLE |
>>> +				  HDC_BARRIER_PERFORMANCE_DISABLE);
>>> +
>>>  	return skl_tune_iz_hashing(ring);
>>>  }
>>>  
>>> -- 
>>> 2.3.6
>>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> -- 
> Jani Nikula, Intel Open Source Technology Center

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