[PATCH] Revert "drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits"

[Luis Henriques]

Ben Hutchings <ben at decadent.org.uk> writes:

> On Mon, 2013-04-22 at 16:23 -0500, Steve Conklin wrote:
>> This reverts commit 30ae292ec68402c773ddc8c80f83f7cd84289a39.
>> 
>> This has been shown to cause GPU hangs
>
> So this should be reverted in 3.2.y as well, right?  Or has there been
> another change that makes it OK?
>
> Ben.

We have reverted it in the Ubuntu Precise kernel as well (which is
based on the 3.2 kernel), as we had users reporting this regression
(http://bugs.launchpad.net/bugs/1140716).

So, I would say it is also applicable to 3.2.y, although I believe we
haven't actually tested a vanilla 3.2.y kernel.

Cheers,
-- 
Luis


>
>> ---
>>  drivers/gpu/drm/i915/intel_ringbuffer.c |    5 -----
>>  1 file changed, 5 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
>> index c3654ff..fbaa785 100644
>> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
>> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
>> @@ -422,11 +422,6 @@ static int init_render_ring(struct intel_ring_buffer *ring)
>>  	if (INTEL_INFO(dev)->gen >= 6)
>>  		I915_WRITE(MI_MODE, GFX_MODE_ENABLE(ASYNC_FLIP_PERF_DISABLE));
>>  
>> -	/* Required for the hardware to program scanline values for waiting */
>> -	if (INTEL_INFO(dev)->gen == 6)
>> -		I915_WRITE(GFX_MODE,
>> -			   GFX_MODE_ENABLE(GFX_TLB_INVALIDATE_ALWAYS));
>> -
>>  	if (IS_GEN7(dev))
>>  		I915_WRITE(GFX_MODE_GEN7,
>>  			   GFX_MODE_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) |
>> -- 
>> 1.7.9.5
>> 
>> 
>
> -- 
> Ben Hutchings
> friends: People who know you well, but like you anyway.