move radeon_set_screen_flags() up so CHIP_FAMILY is set before using it

fixes last commit.
This commit is contained in:
Alex Deucher 2009-06-10 18:02:20 -04:00
parent 51507b0e94
commit 7ac2f655f8

View file

@ -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");