aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-20 07:41:03 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-25 12:23:53 -0400
commit69c2fc891343cb5217c866d10709343cff190bdc (patch)
treee656c584f732c1cf1b3fc709ba54ff216565f985 /drivers/gpu/drm/i915/intel_ringbuffer.c
parent65ce3027415d4dc9ee18ef0a135214b4fb76730b (diff)
drm/i915: Remove the per-ring write list
This is now handled by a global flag to ensure we emit a flush before the next serialisation point (if we failed to queue one previously). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> 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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index bf0195a96d53..8f221d9a7bdb 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1002,7 +1002,6 @@ static int intel_init_ring_buffer(struct drm_device *dev,
1002 ring->dev = dev; 1002 ring->dev = dev;
1003 INIT_LIST_HEAD(&ring->active_list); 1003 INIT_LIST_HEAD(&ring->active_list);
1004 INIT_LIST_HEAD(&ring->request_list); 1004 INIT_LIST_HEAD(&ring->request_list);
1005 INIT_LIST_HEAD(&ring->gpu_write_list);
1006 ring->size = 32 * PAGE_SIZE; 1005 ring->size = 32 * PAGE_SIZE;
1007 1006
1008 init_waitqueue_head(&ring->irq_queue); 1007 init_waitqueue_head(&ring->irq_queue);
@@ -1473,7 +1472,6 @@ int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size)
1473 ring->dev = dev; 1472 ring->dev = dev;
1474 INIT_LIST_HEAD(&ring->active_list); 1473 INIT_LIST_HEAD(&ring->active_list);
1475 INIT_LIST_HEAD(&ring->request_list); 1474 INIT_LIST_HEAD(&ring->request_list);
1476 INIT_LIST_HEAD(&ring->gpu_write_list);
1477 1475
1478 ring->size = size; 1476 ring->size = size;
1479 ring->effective_size = ring->size; 1477 ring->effective_size = ring->size;