Merge branch 'modesetting-gem' of git+ssh://agd5f@git.freedesktop.org/git/mesa/drm...

diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index 9edd388..019491c 100644 (file)
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -717,7 +717,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev,
 
 #define GET_SCRATCH( x )       (dev_priv->writeback_works ?                    \
                                 (dev_priv->mm.ring_read.bo ? \
-                                 readl(dev_priv->mm.ring_read.kmap.virtual + RADEON_SCRATCHOFF(0)) : \
+                                 readl(dev_priv->mm.ring_read.kmap.virtual + RADEON_SCRATCHOFF(x)) : \
                                  DRM_READ32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(x))) : \
                                 RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x)))