summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-12-05 14:43:22 -0500
committerKristian Høgsberg <krh@redhat.com>2007-12-05 14:43:22 -0500
commite38749ebe5ece08ec63dfd37aca28108ad5cc7ab (patch)
treefbc2d4567fcd9b8b41af3f7ecba22d1384d32e40
parent2f6e53342156ecb0e61a13816043445032c2b539 (diff)
Remove references to the sarea_priv perf_boxes field.
This field isn't touched or read by any other code in the stack so it's time to retire these last few references.
-rw-r--r--shared-core/i915_dma.c5
-rw-r--r--shared-core/i915_irq.c2
2 files changed, 0 insertions, 7 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 31df743f..42114beb 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -51,8 +51,6 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
if (ring->space >= n)
return 0;
- dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
-
if (ring->head != last_head)
i = 0;
@@ -73,9 +71,6 @@ void i915_kernel_lost_context(struct drm_device * dev)
ring->space = ring->head - (ring->tail + 8);
if (ring->space < 0)
ring->space += ring->Size;
-
- if (ring->head == ring->tail)
- dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY;
}
static int i915_dma_cleanup(struct drm_device * dev)
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 2c699ecd..e7f3b083 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -417,8 +417,6 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
if (READ_BREADCRUMB(dev_priv) >= irq_nr)
return 0;
- dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
-
i915_user_irq_on(dev_priv);
DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
READ_BREADCRUMB(dev_priv) >= irq_nr);