Mesa (r6xx-rewrite): Use correct scratch reg offset for r6xx/r7xx
Alex Deucher
agd5f at kemper.freedesktop.org
Wed Jun 10 21:57:32 UTC 2009
Module: Mesa
Branch: r6xx-rewrite
Commit: 51507b0e94ffb375a040ef751a435c2e196ee748
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=51507b0e94ffb375a040ef751a435c2e196ee748
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Jun 10 17:56:05 2009 -0400
Use correct scratch reg offset for r6xx/r7xx
---
src/mesa/drivers/dri/radeon/radeon_screen.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 054ffb4..8309903 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 ) {
More information about the mesa-commit
mailing list