aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-11-07 20:44:14 -0500
committerDave Airlie <airlied@linux.ie>2008-11-11 03:03:28 -0500
commit0baf823a10bd4131f70e9712d1f02de3c247f1df (patch)
tree1a1593f990d54cf2b5f98fb9e4105f05ea6fe742 /drivers/gpu/drm/i915/i915_irq.c
parentafa21e0584f78964c092981fad94e45d38cda249 (diff)
drm/i915: Move legacy breadcrumb out of the reserved status page area
Addresses in the hardware status page below index 0x20 are reserved for use by the hardware. The legacy breadcrumb was sitting at index 5. Move it to index 0x21, and make sure everyone uses the defined value instead of hard-coded constants. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index a75345af62e..82752d6177a 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -212,12 +212,10 @@ static int i915_emit_irq(struct drm_device * dev)
212 if (dev_priv->sarea_priv) 212 if (dev_priv->sarea_priv)
213 dev_priv->sarea_priv->last_enqueue = dev_priv->counter; 213 dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
214 214
215 BEGIN_LP_RING(6); 215 BEGIN_LP_RING(4);
216 OUT_RING(MI_STORE_DWORD_INDEX); 216 OUT_RING(MI_STORE_DWORD_INDEX);
217 OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT); 217 OUT_RING(I915_BREADCRUMB_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
218 OUT_RING(dev_priv->counter); 218 OUT_RING(dev_priv->counter);
219 OUT_RING(0);
220 OUT_RING(0);
221 OUT_RING(MI_USER_INTERRUPT); 219 OUT_RING(MI_USER_INTERRUPT);
222 ADVANCE_LP_RING(); 220 ADVANCE_LP_RING();
223 221