summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorChris Wilson2010-09-14 18:04:02 +0200
committerChris Wilson2010-09-14 22:13:00 +0200
commit2b6efaa47615b29e572d7fc444565db62ca9bcf7 (patch)
tree931e31f35886c6ce8b0cfbebe1955c55b1fbdd7a /drivers/gpu/drm/i915/i915_gem.c
parentdrm/i915/i2c: Track the parent encoder rather than just the dev (diff)
downloadkernel-qcow2-linux-2b6efaa47615b29e572d7fc444565db62ca9bcf7.tar.gz
kernel-qcow2-linux-2b6efaa47615b29e572d7fc444565db62ca9bcf7.tar.xz
kernel-qcow2-linux-2b6efaa47615b29e572d7fc444565db62ca9bcf7.zip
drm/i915: Remove unused intel_ringbuffer->ring_flag
This can always be re-added should somebody find a use... Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 02719df418e3..a83574df096e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1580,9 +1580,8 @@ i915_gem_process_flushing_list(struct drm_device *dev,
gpu_write_list) {
struct drm_gem_object *obj = &obj_priv->base;
- if ((obj->write_domain & flush_domains) ==
- obj->write_domain &&
- obj_priv->ring->ring_flag == ring->ring_flag) {
+ if (obj->write_domain & flush_domains &&
+ obj_priv->ring == ring) {
uint32_t old_write_domain = obj->write_domain;
obj->write_domain = 0;