aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-04-09 08:59:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-22 19:21:22 -0400
commit6a13f93f4a7228247ba4da5cf7d92e7415a05bc5 (patch)
tree88127b296a6b7794c29b63408eecf08748d22085 /drivers/gpu/drm
parent0527fde0639955203ad48a9fd83bd6fc35e82e07 (diff)
drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
commit 27c1cbd06a7620b354cbb363834f3bb8df4f410d upstream. The 845g shares the errata with i830 whereby executing a command within 2 cachelines of the end of the ringbuffer may cause a GPU hang. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 1f61fc7b754..2d6039b4571 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -863,7 +863,7 @@ int intel_init_ring_buffer(struct drm_device *dev,
863 * of the buffer. 863 * of the buffer.
864 */ 864 */
865 ring->effective_size = ring->size; 865 ring->effective_size = ring->size;
866 if (IS_I830(ring->dev)) 866 if (IS_I830(ring->dev) || IS_845G(ring->dev))
867 ring->effective_size -= 128; 867 ring->effective_size -= 128;
868 868
869 return 0; 869 return 0;