radeonsi: rename SI chip class from TAHITI to SI

Covers the entire family.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index 3f4cd78cd5796f832795b62fa45d2a16301adbaa..775fa97306d94b04dc2b99ad2f3463e506e81500 100644 (file)
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -232,7 +232,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        }
 
        switch (rctx->chip_class) {
-       case TAHITI:
+       case SI:
                si_init_state_functions(rctx);
                LIST_INITHEAD(&rctx->active_query_list);
                rctx->cs = rctx->ws->cs_create(rctx->ws, RING_GFX, NULL);
@@ -795,7 +795,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
 
        /* setup class */
        if (rscreen->family >= CHIP_TAHITI) {
-               rscreen->chip_class = TAHITI;
+               rscreen->chip_class = SI;
        } else {
                fprintf(stderr, "r600: Unsupported family %d\n", rscreen->family);
                FREE(rscreen);

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index ee4dfa11f501e9e0cc914139de06201add23c55a..0eec984565f1ba5e24a28efeff4b1ab4acbcd210 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -322,7 +322,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws)
     case CHIP_VERDE:
     case CHIP_OLAND:
     case CHIP_HAINAN:
-        ws->info.chip_class = TAHITI;
+        ws->info.chip_class = SI;
         break;
     }
 

diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h
index d0f16e1800fe2b96363e754657f3cb422c9d826b..8dba64e18198bfca7518d139334000cfa73f5966 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
+++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
@@ -137,7 +137,7 @@ enum chip_class {
     R700,
     EVERGREEN,
     CAYMAN,
-    TAHITI,
+    SI,
 };
 
 enum ring_type {