diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-09-24 15:49:27 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-25 07:23:16 -0400 |
commit | 447da18742b170b8e09ac71edf63c5798d2dbb0b (patch) | |
tree | 3c7fc5ff8d4a5c8afde505ae0fa1126f352e205e /drivers/gpu/drm/i915/i915_dma.c | |
parent | 79f321b7e676bd54f563c5ce513588aa90b2cc21 (diff) |
drm/i915: kill ring->setup_status_page
It's the same code, essentially, so kill all copies safe one unified
version.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a3aea17c964b..ba050ed8df51 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -221,7 +221,7 @@ static int i915_dma_resume(struct drm_device * dev) | |||
221 | DRM_DEBUG_DRIVER("hw status page @ %p\n", | 221 | DRM_DEBUG_DRIVER("hw status page @ %p\n", |
222 | ring->status_page.page_addr); | 222 | ring->status_page.page_addr); |
223 | if (ring->status_page.gfx_addr != 0) | 223 | if (ring->status_page.gfx_addr != 0) |
224 | ring->setup_status_page(dev, ring); | 224 | intel_ring_setup_status_page(dev, ring); |
225 | else | 225 | else |
226 | I915_WRITE(HWS_PGA, dev_priv->dma_status_page); | 226 | I915_WRITE(HWS_PGA, dev_priv->dma_status_page); |
227 | 227 | ||