diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-04-09 08:59:46 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-11 06:14:24 -0400 |
commit | 27c1cbd06a7620b354cbb363834f3bb8df4f410d (patch) | |
tree | 0c65a9e811897758f568b73ee0466b1f5fa66f19 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | 6a562e3daee217ce99fe0e31150acd89a5b22606 (diff) |
drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
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>
Cc: stable@kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
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 e25581a9f60f..f75806e5bff5 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -1038,7 +1038,7 @@ int intel_init_ring_buffer(struct drm_device *dev, | |||
1038 | * of the buffer. | 1038 | * of the buffer. |
1039 | */ | 1039 | */ |
1040 | ring->effective_size = ring->size; | 1040 | ring->effective_size = ring->size; |
1041 | if (IS_I830(ring->dev)) | 1041 | if (IS_I830(ring->dev) || IS_845G(ring->dev)) |
1042 | ring->effective_size -= 128; | 1042 | ring->effective_size -= 128; |
1043 | 1043 | ||
1044 | return 0; | 1044 | return 0; |