[Intel-gfx] [PATCH] drm/i915: Fix SRC_COPY width on 830/845g

[Jani Nikula]

On Fri, 12 Sep 2014, Jani Nikula <jani.nikula at intel.com> wrote:
> On Fri, 12 Sep 2014, Chris Wilson <chris at chris-wilson.co.uk> wrote:
>> One small change I forgot to make in
>>
>> commit c4d69da167fa967749aeb70bc0e94a457e5d00c1
>> Author: Chris Wilson <chris at chris-wilson.co.uk>
>> Date:   Mon Sep 8 14:25:41 2014 +0100
>>
>>     drm/i915: Evict CS TLBs between batches
>>
>> was to update the copy width for the compact BLT copy instruction.
>>
>> Reported-by: Thomas Richter <thor at math.tu-berlin.de>
>> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
>> Cc: Thomas Richter <thor at math.tu-berlin.de>
>> Cc: Jani Nikula <jani.nikula at intel.com>
>> Cc: stable at vger.kernel.org
>
> http://mid.gmane.org/54129ED3.8060105@math.tu-berlin.de says
>
> Tested-by: Thomas Richter <thor at math.tu-berlin.de>
>
> (Thomas, your mails have broken in-reply-to/references more often than
> not, breaking threading. Please check your setup.)

Pushed to drm-intel-fixes with Daniel's irc ack, thanks for the patch
and testing.

BR,
Jani.


>
>
>> ---
>>  drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
>> index d0156d6..45d70fd 100644
>> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
>> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
>> @@ -1386,7 +1386,7 @@ i830_emit_batchbuffer(struct i915_gem_request *rq,
>>  		 */
>>  		intel_ring_emit(ring, SRC_COPY_BLT_CMD | BLT_WRITE_RGBA);
>>  		intel_ring_emit(ring, BLT_DEPTH_32 | BLT_ROP_SRC_COPY | 4096);
>> -		intel_ring_emit(ring, DIV_ROUND_UP(len, 4096) << 16 | 1024);
>> +		intel_ring_emit(ring, DIV_ROUND_UP(len, 4096) << 16 | 4096);
>>  		intel_ring_emit(ring, cs_offset);
>>  		intel_ring_emit(ring, 4096);
>>  		intel_ring_emit(ring, offset);
>> -- 
>> 1.9.1
>>
>> _______________________________________________
>> 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
> _______________________________________________
> 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