lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/i915: Remove unused intel_ringbuffer->ring_flag

Browse Source 
This can always be re-added should somebody find a use...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2010-09-14 17:04:02 +01:00
parent 890f3359f7
commit 2b6efaa476
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -1580,9 +1580,8 @@ i915_gem_process_flushing_list(struct drm_device *dev,
gpu_write_list) { gpu_write_list) {
struct drm_gem_object *obj = &obj_priv->base; struct drm_gem_object *obj = &obj_priv->base;
if ((obj->write_domain & flush_domains) == if (obj->write_domain & flush_domains &&
obj->write_domain && obj_priv->ring == ring) {
obj_priv->ring->ring_flag == ring->ring_flag) {
uint32_t old_write_domain = obj->write_domain; uint32_t old_write_domain = obj->write_domain;
obj->write_domain = 0; obj->write_domain = 0;

2
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@@ -805,7 +805,6 @@ struct intel_ring_buffer render_ring = {
.tail = PRB0_TAIL, .tail = PRB0_TAIL,
.start = PRB0_START .start = PRB0_START
}, },
.ring_flag = I915_EXEC_RENDER,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE, .alignment = PAGE_SIZE,
.virtual_start = NULL, .virtual_start = NULL,
@@ -843,7 +842,6 @@ struct intel_ring_buffer bsd_ring = {
.tail = BSD_RING_TAIL, .tail = BSD_RING_TAIL,
.start = BSD_RING_START .start = BSD_RING_START
}, },
.ring_flag = I915_EXEC_BSD,
.size = 32 * PAGE_SIZE, .size = 32 * PAGE_SIZE,
.alignment = PAGE_SIZE, .alignment = PAGE_SIZE,
.virtual_start = NULL, .virtual_start = NULL,

1
drivers/gpu/drm/i915/intel_ringbuffer.h
View File

@@ -16,7 +16,6 @@ struct intel_ring_buffer {
u32 tail; u32 tail;
u32 start; u32 start;
} regs; } regs;
unsigned int ring_flag;
unsigned long size; unsigned long size;
unsigned int alignment; unsigned int alignment;
void *virtual_start; void *virtual_start;