diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2008-08-19 13:08:47 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-19 13:08:47 -0400 |
| commit | 76cec451d3380c0db28be58123904b489be672a7 (patch) | |
| tree | d17feb78216c3f8af8cb489618796e0987097c4d | |
| parent | ba61880ac8d5db0494816296aeef6092aadcb63f (diff) | |
| parent | 2d4cf9cc0f31ca316b109cceffc463ea52db92f2 (diff) | |
Merge branch 'modesetting-gem' of git+ssh://agd5f@git.freedesktop.org/git/mesa/drm into modesetting-gem
| -rw-r--r-- | shared-core/radeon_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index 9edd3884..019491c7 100644 --- 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))) |