Mesa (r6xx-rewrite): move radeon_set_screen_flags() up so CHIP_FAMILY is set before using it
Alex Deucher
agd5f at kemper.freedesktop.org
Wed Jun 10 22:03:09 UTC 2009
Module: Mesa
Branch: r6xx-rewrite
Commit: 7ac2f655f845a7a100939a9b1b2251535055ab84
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ac2f655f845a7a100939a9b1b2251535055ab84
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Jun 10 18:02:20 2009 -0400
move radeon_set_screen_flags() up so CHIP_FAMILY is set before using it
fixes last commit.
---
src/mesa/drivers/dri/radeon/radeon_screen.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 8309903..da18996 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -999,6 +999,10 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
screen->drmSupportsVertexProgram = (sPriv->drm_version.minor >= 25);
}
+ ret = radeon_set_screen_flags(screen, dri_priv->deviceID);
+ if (ret == -1)
+ return NULL;
+
if (!screen->kernel_mm) {
screen->mmio.handle = dri_priv->registerHandle;
screen->mmio.size = dri_priv->registerSize;
@@ -1060,10 +1064,6 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
}
- ret = radeon_set_screen_flags(screen, dri_priv->deviceID);
- if (ret == -1)
- return NULL;
-
if ((screen->chip_family == CHIP_FAMILY_R350 || screen->chip_family == CHIP_FAMILY_R300) &&
sPriv->ddx_version.minor < 2) {
fprintf(stderr, "xf86-video-ati-6.6.2 or newer needed for Radeon 9500/9700/9800 cards.\n");
More information about the mesa-commit
mailing list