i915: use breadcrumb macro everywhere
authorDave Airlie <airlied@linux.ie>
Sun, 1 Apr 2007 06:30:52 +0000 (16:30 +1000)
committerDave Airlie <airlied@linux.ie>
Fri, 6 Apr 2007 10:21:44 +0000 (20:21 +1000)
shared-core/i915_dma.c

index aed3eea..f66c08e 100644 (file)
@@ -643,7 +643,6 @@ static int i915_batchbuffer(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-       u32 *hw_status = dev_priv->hw_status_page;
        drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
            dev_priv->sarea_priv;
        drm_i915_batchbuffer_t batch;
@@ -669,7 +668,7 @@ static int i915_batchbuffer(DRM_IOCTL_ARGS)
 
        ret = i915_dispatch_batchbuffer(dev, &batch);
 
-       sarea_priv->last_dispatch = (int)hw_status[5];
+       sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
        return ret;
 }
 
@@ -677,7 +676,6 @@ static int i915_cmdbuffer(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-       u32 *hw_status = dev_priv->hw_status_page;
        drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
            dev_priv->sarea_priv;
        drm_i915_cmdbuffer_t cmdbuf;
@@ -705,7 +703,7 @@ static int i915_cmdbuffer(DRM_IOCTL_ARGS)
                return ret;
        }
 
-       sarea_priv->last_dispatch = (int)hw_status[5];
+       sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
        return 0;
 }