[Mesa-dev] [PATCH 081/140] radeonsi/gfx9: enable ETC2

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 5f0eab1..c91b0a7 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1418,21 +1418,22 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen,
 		case PIPE_FORMAT_LATC2_SNORM:
 		case PIPE_FORMAT_RGTC2_UNORM:
 		case PIPE_FORMAT_LATC2_UNORM:
 			return V_008F14_IMG_DATA_FORMAT_BC5;
 		default:
 			goto out_unknown;
 		}
 	}
 
 	if (desc->layout == UTIL_FORMAT_LAYOUT_ETC &&
-	    sscreen->b.family == CHIP_STONEY) {
+	    (sscreen->b.family == CHIP_STONEY ||
+	     sscreen->b.chip_class >= GFX9)) {
 		switch (format) {
 		case PIPE_FORMAT_ETC1_RGB8:
 		case PIPE_FORMAT_ETC2_RGB8:
 		case PIPE_FORMAT_ETC2_SRGB8:
 			return V_008F14_IMG_DATA_FORMAT_ETC2_RGB;
 		case PIPE_FORMAT_ETC2_RGB8A1:
 		case PIPE_FORMAT_ETC2_SRGB8A1:
 			return V_008F14_IMG_DATA_FORMAT_ETC2_RGBA1;
 		case PIPE_FORMAT_ETC2_RGBA8:
 		case PIPE_FORMAT_ETC2_SRGBA8:
-- 
2.7.4