diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-02-11 16:29:04 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 05:23:36 -0400 |
commit | 8a1a49f954734040dbc7b87e3b1221a050045e43 (patch) | |
tree | 4bd64e76791b1e56e5ffc69f065e3831fe0b9979 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | a6910434e1b5f2a9fe7cab39b01bae9a7a7bbe70 (diff) |
drm/i915: move flushing list processing to i915_retire_commands
... instead of threading flush_domains through the execbuf code to
i915_add_request.
With this change 2 small cleanups are possible (likewise the majority
of the patch):
- The flush_domains parameter of i915_add_request is always 0. Drop it
and the corresponding logic.
- Ditto for the seqno param of i915_gem_process_flushing_list.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index cb3508f78bc3..1ae2b25bf7e4 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -116,6 +116,8 @@ render_ring_flush(struct drm_device *dev, | |||
116 | intel_ring_emit(dev, ring, MI_NOOP); | 116 | intel_ring_emit(dev, ring, MI_NOOP); |
117 | intel_ring_advance(dev, ring); | 117 | intel_ring_advance(dev, ring); |
118 | } | 118 | } |
119 | |||
120 | i915_gem_process_flushing_list(dev, flush_domains, ring); | ||
119 | } | 121 | } |
120 | 122 | ||
121 | static unsigned int render_ring_get_head(struct drm_device *dev, | 123 | static unsigned int render_ring_get_head(struct drm_device *dev, |
@@ -384,6 +386,8 @@ bsd_ring_flush(struct drm_device *dev, | |||
384 | intel_ring_emit(dev, ring, MI_FLUSH); | 386 | intel_ring_emit(dev, ring, MI_FLUSH); |
385 | intel_ring_emit(dev, ring, MI_NOOP); | 387 | intel_ring_emit(dev, ring, MI_NOOP); |
386 | intel_ring_advance(dev, ring); | 388 | intel_ring_advance(dev, ring); |
389 | |||
390 | i915_gem_process_flushing_list(dev, flush_domains, ring); | ||
387 | } | 391 | } |
388 | 392 | ||
389 | static inline unsigned int bsd_ring_get_head(struct drm_device *dev, | 393 | static inline unsigned int bsd_ring_get_head(struct drm_device *dev, |