public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/ringbuffer: exclude last 2 cachelines on 845g on all callpaths
@ 2012-10-29 14:59 Mika Kuoppala
  2012-10-30 23:54 ` Daniel Vetter
  0 siblings, 1 reply; 2+ messages in thread
From: Mika Kuoppala @ 2012-10-29 14:59 UTC (permalink / raw)
  To: intel-gfx

Make intel_render_ring_init_dri and intel_init_ring_buffer symmetrical
with regards of workaround introduced by:

commit 27c1cbd06a7620b354cbb363834f3bb8df4f410d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Apr 9 13:59:46 2012 +0100

    drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 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 785df4f..b13393b 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1590,7 +1590,7 @@ int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size)
 
 	ring->size = size;
 	ring->effective_size = ring->size;
-	if (IS_I830(ring->dev))
+	if (IS_I830(ring->dev) || IS_845G(ring->dev))
 		ring->effective_size -= 128;
 
 	ring->virtual_start = ioremap_wc(start, size);
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/i915/ringbuffer: exclude last 2 cachelines on 845g on all callpaths
  2012-10-29 14:59 [PATCH] drm/i915/ringbuffer: exclude last 2 cachelines on 845g on all callpaths Mika Kuoppala
@ 2012-10-30 23:54 ` Daniel Vetter
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2012-10-30 23:54 UTC (permalink / raw)
  To: Mika Kuoppala; +Cc: intel-gfx

On Mon, Oct 29, 2012 at 04:59:26PM +0200, Mika Kuoppala wrote:
> Make intel_render_ring_init_dri and intel_init_ring_buffer symmetrical
> with regards of workaround introduced by:
> 
> commit 27c1cbd06a7620b354cbb363834f3bb8df4f410d
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date:   Mon Apr 9 13:59:46 2012 +0100
> 
>     drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-10-30 23:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-29 14:59 [PATCH] drm/i915/ringbuffer: exclude last 2 cachelines on 845g on all callpaths Mika Kuoppala
2012-10-30 23:54 ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox