From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 7 Jun 2013 17:58:34 +0000 (-0400)
Subject: radeonsi: rename SI chip class from TAHITI to SI
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5b3f1ea933a7ab6aa09ecdd1529b2baac558804e;p=mesa.git

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 3f4cd78cd57..775fa97306d 100644
--- 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 ee4dfa11f50..0eec984565f 100644
--- 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 d0f16e1800f..8dba64e1819 100644
--- 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 {