diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-06-10 18:02:20 -0400 |
---|---|---|
committer | Alex Deucher <alexdeucher@gmail.com> | 2009-06-10 18:02:20 -0400 |
commit | 7ac2f655f845a7a100939a9b1b2251535055ab84 (patch) | |
tree | 69f646b5937fb2483d86b80f006d75d3a8a451e4 | |
parent | 51507b0e94ffb375a040ef751a435c2e196ee748 (diff) |
move radeon_set_screen_flags() up so CHIP_FAMILY is set before using it
fixes last commit.
-rw-r--r-- | 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 8309903e78..da18996c0f 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"); |