diff options
| author | Keith Packard <keithp@keithp.com> | 2008-11-08 02:44:14 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-11-11 09:03:28 +0100 |
| commit | 0baf823a10bd4131f70e9712d1f02de3c247f1df (patch) | |
| tree | 1a1593f990d54cf2b5f98fb9e4105f05ea6fe742 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | drm/i915: Filter pci devices based on PCI_CLASS_DISPLAY_VGA (diff) | |
| download | linux-0baf823a10bd4131f70e9712d1f02de3c247f1df.tar.xz linux-0baf823a10bd4131f70e9712d1f02de3c247f1df.zip | |
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.c | 6 |
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 a75345af62ef..82752d6177a4 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) if (dev_priv->sarea_priv) dev_priv->sarea_priv->last_enqueue = dev_priv->counter; - BEGIN_LP_RING(6); + BEGIN_LP_RING(4); OUT_RING(MI_STORE_DWORD_INDEX); - OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT); + OUT_RING(I915_BREADCRUMB_INDEX << MI_STORE_DWORD_INDEX_SHIFT); OUT_RING(dev_priv->counter); - OUT_RING(0); - OUT_RING(0); OUT_RING(MI_USER_INTERRUPT); ADVANCE_LP_RING(); |