diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-04-09 13:59:46 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-11 12:14:24 +0200 |
| commit | 27c1cbd06a7620b354cbb363834f3bb8df4f410d (patch) | |
| tree | 0c65a9e811897758f568b73ee0466b1f5fa66f19 | |
| parent | 6a562e3daee217ce99fe0e31150acd89a5b22606 (diff) | |
| download | linux-3.10-27c1cbd06a7620b354cbb363834f3bb8df4f410d.tar.gz linux-3.10-27c1cbd06a7620b354cbb363834f3bb8df4f410d.tar.bz2 linux-3.10-27c1cbd06a7620b354cbb363834f3bb8df4f410d.zip | |
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>
| -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 e25581a9f60..f75806e5bff 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, * of the buffer. */ ring->effective_size = ring->size; - if (IS_I830(ring->dev)) + if (IS_I830(ring->dev) || IS_845G(ring->dev)) ring->effective_size -= 128; return 0; |