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>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 02719df418e39425ab2dd4ec90167aaf341637e0..a83574df096eb70f2ce77c0c381193051901461f 100644 (file)
--- 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;

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 1ae2b25bf7e485e5699df8b4da03b90fcc78d144..11bcfc871a0d3c295c79e197cce354ad16166420 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -805,7 +805,6 @@ struct intel_ring_buffer render_ring = {
                .tail = PRB0_TAIL,
                .start = PRB0_START
        },
-       .ring_flag              = I915_EXEC_RENDER,
        .size                   = 32 * PAGE_SIZE,
        .alignment              = PAGE_SIZE,
        .virtual_start          = NULL,
@@ -843,7 +842,6 @@ struct intel_ring_buffer bsd_ring = {
                .tail = BSD_RING_TAIL,
                .start = BSD_RING_START
        },
-       .ring_flag              = I915_EXEC_BSD,
        .size                   = 32 * PAGE_SIZE,
        .alignment              = PAGE_SIZE,
        .virtual_start          = NULL,

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index d3e5f40a80409f4ec721730a3217f1ef1869c099..fa5d84f85c26baf31dfd419144110ab4be609370 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -16,7 +16,6 @@ struct  intel_ring_buffer {
                        u32 tail;
                        u32 start;
        } regs;
-       unsigned int    ring_flag;
        unsigned long   size;
        unsigned int    alignment;
        void            *virtual_start;