[Intel-gfx] [PATCH] drm/i915: Ban Haswell from using RCS flips

[Jani Nikula]

On Tue, 30 Dec 2014, Jani Nikula <jani.nikula at linux.intel.com> wrote:
> On Sat, 27 Dec 2014, Chris Wilson <chris at chris-wilson.co.uk> wrote:
>> Like Ivybridge, we have reports that we get random hangs when flipping
>> with multiple pipes. Extend
>>
>> commit 2a92d5bca1999b69c78f3c3e97b5484985b094b9
>> Author: Chris Wilson <chris at chris-wilson.co.uk>
>> Date:   Tue Jul 8 10:40:29 2014 +0100
>>
>>     drm/i915: Disable RCS flips on Ivybridge
>>
>> to also apply to Haswell.
>>
>> Reported-by: Scott Tsai <scottt.tw at gmail.com>
>
> From the bug,
>
> Tested-by: Scott Tsai <scottt.tw at gmail.com>
>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87759
>> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Pushed to drm-intel-fixes with Daniel's IRC r-b and cc: stable (also on
the ivb commit). Thanks for the patch and review.

BR,
Jani.


>> ---
>>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>> index d01db1b82869..ed2102e62271 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -9703,7 +9703,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
>>  		if (obj->tiling_mode != work->old_fb_obj->tiling_mode)
>>  			/* vlv: DISPLAY_FLIP fails to change tiling */
>>  			ring = NULL;
>> -	} else if (IS_IVYBRIDGE(dev)) {
>> +	} else if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) {
>>  		ring = &dev_priv->ring[BCS];
>>  	} else if (INTEL_INFO(dev)->gen >= 7) {
>>  		ring = i915_gem_request_get_ring(obj->last_read_req);
>> -- 
>> 2.1.4
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at 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