From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 10 Jun 2009 21:56:05 +0000 (-0400)
Subject: Use correct scratch reg offset for r6xx/r7xx
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51507b0e94ffb375a040ef751a435c2e196ee748;p=mesa.git

Use correct scratch reg offset for r6xx/r7xx
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 054ffb4c325..8309903e788 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1024,8 +1024,12 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
        __driUtilMessage("%s: drmMap (2) failed\n", __FUNCTION__ );
        return NULL;
      }
-     screen->scratch = (__volatile__ uint32_t *)
-       ((GLubyte *)screen->status.map + RADEON_SCRATCH_REG_OFFSET);
+     if (screen->chip_family < CHIP_FAMILY_R600)
+	     screen->scratch = (__volatile__ uint32_t *)
+		     ((GLubyte *)screen->status.map + RADEON_SCRATCH_REG_OFFSET);
+     else
+	     screen->scratch = (__volatile__ uint32_t *)
+		     ((GLubyte *)screen->status.map + R600_SCRATCH_REG_OFFSET);
 
      screen->buffers = drmMapBufs( sPriv->fd );
      if ( !screen->buffers ) {