diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-08-07 06:01:22 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-08-09 14:24:32 -0400 |
commit | 6f392d548658a17600da7faaf8a5df25ee5f01f6 (patch) | |
tree | f71098d2faa94ca6525862a0ea50e831abcba75a /drivers/gpu/drm/i915/i915_drv.h | |
parent | 0108a3edd5c2e3b150a550d565b6aa1a67c0edbe (diff) |
drm/i915: Use a common seqno for all rings.
This will be used by the eviction logic to maintain fairness between the
rings.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 151056501a5f..def6ee0a3524 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -244,6 +244,7 @@ typedef struct drm_i915_private { | |||
244 | struct pci_dev *bridge_dev; | 244 | struct pci_dev *bridge_dev; |
245 | struct intel_ring_buffer render_ring; | 245 | struct intel_ring_buffer render_ring; |
246 | struct intel_ring_buffer bsd_ring; | 246 | struct intel_ring_buffer bsd_ring; |
247 | uint32_t next_seqno; | ||
247 | 248 | ||
248 | drm_dma_handle_t *status_page_dmah; | 249 | drm_dma_handle_t *status_page_dmah; |
249 | void *seqno_page; | 250 | void *seqno_page; |
@@ -573,8 +574,6 @@ typedef struct drm_i915_private { | |||
573 | */ | 574 | */ |
574 | struct delayed_work retire_work; | 575 | struct delayed_work retire_work; |
575 | 576 | ||
576 | uint32_t next_gem_seqno; | ||
577 | |||
578 | /** | 577 | /** |
579 | * Waiting sequence number, if any | 578 | * Waiting sequence number, if any |
580 | */ | 579 | */ |