diff options
| author | Eric Anholt <eric@anholt.net> | 2012-01-17 12:10:51 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-01-17 16:03:20 -0800 |
| commit | 018e0c6ec2a633e1e631223cb0eb1ad41d5e0be2 (patch) | |
| tree | 0595886da33b14078baf7a7dec487f6ffaff127e | |
| parent | 1ab9509f32679678a36152666eed882263c0d1af (diff) | |
drm/i915: Drop the effectively-unused arguments to i915_gem_flush_ring().no-more-domains-2
Well, they were used by the tracepoint, but they didn't reflect what
was being flushed, so just set the tracepoint values to 0. The check
for the domains being 0 was duplicated in the one remaining caller.
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_trace.h | 8 |
4 files changed, 8 insertions, 17 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f8bb115e85d..646ba43437c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1117,9 +1117,7 @@ int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); void i915_gem_load(struct drm_device *dev); int i915_gem_init_object(struct drm_gem_object *obj); -int __must_check i915_gem_flush_ring(struct intel_ring_buffer *ring, - uint32_t invalidate_domains, - uint32_t flush_domains); +int __must_check i915_gem_flush_ring(struct intel_ring_buffer *ring); struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev, size_t size); void i915_gem_free_object(struct drm_gem_object *obj); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a197eabf402..85bd403c135 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2070,16 +2070,11 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj) } int -i915_gem_flush_ring(struct intel_ring_buffer *ring, - uint32_t invalidate_domains, - uint32_t flush_domains) +i915_gem_flush_ring(struct intel_ring_buffer *ring) { int ret; - if (((invalidate_domains | flush_domains) & I915_GEM_GPU_DOMAINS) == 0) - return 0; - - trace_i915_gem_ring_flush(ring, invalidate_domains, flush_domains); + trace_i915_gem_ring_flush(ring); ret = ring->flush(ring); if (ret) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 75348f5e77e..daeedbacd8c 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -741,9 +741,7 @@ i915_gem_execbuffer_flush(struct intel_ring_buffer *ring, if ((flush_domains | invalidate_domains) & I915_GEM_GPU_DOMAINS) { for (i = 0; i < I915_NUM_RINGS; i++) if (flush_rings & (1 << i)) { - ret = i915_gem_flush_ring(&dev_priv->ring[i], - invalidate_domains, - flush_domains); + ret = i915_gem_flush_ring(&dev_priv->ring[i]); if (ret) return ret; } diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index dac7bba4d9d..9552e1eadfa 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -254,8 +254,8 @@ TRACE_EVENT(i915_gem_ring_dispatch, ); TRACE_EVENT(i915_gem_ring_flush, - TP_PROTO(struct intel_ring_buffer *ring, u32 invalidate, u32 flush), - TP_ARGS(ring, invalidate, flush), + TP_PROTO(struct intel_ring_buffer *ring), + TP_ARGS(ring), TP_STRUCT__entry( __field(u32, dev) @@ -267,8 +267,8 @@ TRACE_EVENT(i915_gem_ring_flush, TP_fast_assign( __entry->dev = ring->dev->primary->index; __entry->ring = ring->id; - __entry->invalidate = invalidate; - __entry->flush = flush; + __entry->invalidate = 0; + __entry->flush = 0; ), TP_printk("dev=%u, ring=%x, invalidate=%04x, flush=%04x", |