move radeon_set_screen_flags() up so CHIP_FAMILY is set before using it
authorAlex Deucher <alexdeucher@gmail.com>
Wed, 10 Jun 2009 22:02:20 +0000 (18:02 -0400)
committerAlex Deucher <alexdeucher@gmail.com>
Wed, 10 Jun 2009 22:02:20 +0000 (18:02 -0400)
fixes last commit.

src/mesa/drivers/dri/radeon/radeon_screen.c

index 8309903e788774f407d8c4f4d0e001ff71603cb9..da18996c0f59abfb82d77e648c62c0cb562a9ec4 100644 (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");