* [PATCH] drm/i915: Fix SRC_COPY width on 830/845g
@ 2014-09-12 6:37 Chris Wilson
2014-09-12 7:41 ` [Intel-gfx] " Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2014-09-12 6:37 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson, Thomas Richter, Jani Nikula, stable
One small change I forgot to make in
commit c4d69da167fa967749aeb70bc0e94a457e5d00c1
Author: Chris Wilson <chris@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@math.tu-berlin.de>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Thomas Richter <thor@math.tu-berlin.de>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: stable@vger.kernel.org
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915: Fix SRC_COPY width on 830/845g
2014-09-12 6:37 [PATCH] drm/i915: Fix SRC_COPY width on 830/845g Chris Wilson
@ 2014-09-12 7:41 ` Jani Nikula
2014-09-12 15:06 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Jani Nikula @ 2014-09-12 7:41 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: stable, Thomas Richter
On Fri, 12 Sep 2014, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> One small change I forgot to make in
>
> commit c4d69da167fa967749aeb70bc0e94a457e5d00c1
> Author: Chris Wilson <chris@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@math.tu-berlin.de>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Thomas Richter <thor@math.tu-berlin.de>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: stable@vger.kernel.org
http://mid.gmane.org/54129ED3.8060105@math.tu-berlin.de says
Tested-by: Thomas Richter <thor@math.tu-berlin.de>
(Thomas, your mails have broken in-reply-to/references more often than
not, breaking threading. Please check your setup.)
> ---
> 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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Fix SRC_COPY width on 830/845g
2014-09-12 7:41 ` [Intel-gfx] " Jani Nikula
@ 2014-09-12 15:06 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2014-09-12 15:06 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: stable
On Fri, 12 Sep 2014, Jani Nikula <jani.nikula@intel.com> wrote:
> On Fri, 12 Sep 2014, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> One small change I forgot to make in
>>
>> commit c4d69da167fa967749aeb70bc0e94a457e5d00c1
>> Author: Chris Wilson <chris@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@math.tu-berlin.de>
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Thomas Richter <thor@math.tu-berlin.de>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: stable@vger.kernel.org
>
> http://mid.gmane.org/54129ED3.8060105@math.tu-berlin.de says
>
> Tested-by: Thomas Richter <thor@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@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <23616_1410503880_541294C8_23616_19426_1_1410503862-29589-1-git-send-email-chris@chris-wilson.co.uk>]
* Re: [PATCH] drm/i915: Fix SRC_COPY width on 830/845g
[not found] <23616_1410503880_541294C8_23616_19426_1_1410503862-29589-1-git-send-email-chris@chris-wilson.co.uk>
@ 2014-09-12 7:20 ` Thomas Richter
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Richter @ 2014-09-12 7:20 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Jani Nikula, stable
Am 12.09.2014 08:37, schrieb Chris Wilson:
> One small change I forgot to make in
>
> commit c4d69da167fa967749aeb70bc0e94a457e5d00c1
> Author: Chris Wilson <chris@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@math.tu-berlin.de>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Thomas Richter <thor@math.tu-berlin.de>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: stable@vger.kernel.org
> ---
> 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);
Thanks Chris, this has done the trick! I get again a working display and
a working GPU on my 830 machine.
Tested-by: Thomas Richter <thor@math.tu-berlin.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-12 15:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-12 6:37 [PATCH] drm/i915: Fix SRC_COPY width on 830/845g Chris Wilson
2014-09-12 7:41 ` [Intel-gfx] " Jani Nikula
2014-09-12 15:06 ` Jani Nikula
[not found] <23616_1410503880_541294C8_23616_19426_1_1410503862-29589-1-git-send-email-chris@chris-wilson.co.uk>
2014-09-12 7:20 ` Thomas Richter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox