radeonsi/gfx9: handle GFX9 in a few places

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index bee35cd82120ab8ce98282fb00154f13af89243c..fdcf22f6d4968c54a6698d02c230e8d8f5642425 100644 (file)
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -429,9 +429,9 @@ static bool cik_sdma_copy_texture(struct si_context *sctx,
            dsty % 8 == 0 &&
            srcx % 8 == 0 &&
            srcy % 8 == 0 &&
-           /* this can either be equal, or display->rotated (VI only) */
+           /* this can either be equal, or display->rotated (VI+ only) */
            (src_micro_mode == dst_micro_mode ||
-            (sctx->b.chip_class == VI &&
+            (sctx->b.chip_class >= VI &&
              src_micro_mode == V_009910_ADDR_SURF_DISPLAY_MICRO_TILING &&
              dst_micro_mode == V_009910_ADDR_SURF_ROTATED_MICRO_TILING))) {
                assert(src_pitch % 8 == 0);

diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c
index 00db2c45badb1dee005b2e9add4a1dad5a19c1ab..41dd52edb1116049ade35b1107437edd46c05389 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_perfcounter.c
+++ b/src/gallium/drivers/radeonsi/si_perfcounter.c
@@ -672,6 +672,7 @@ void si_init_perfcounters(struct si_screen *screen)
                num_blocks = ARRAY_SIZE(groups_VI);
                break;
        case SI:
+       case GFX9:
        default:
                return; /* not implemented */
        }

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index c66203e0add2b7e3a9189d9a8a722c3cc4b93596..7f0b4453088bee42698badc360d492c850a2a934 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -731,6 +731,7 @@ static bool si_init_gs_info(struct si_screen *sscreen)
        case CHIP_POLARIS10:
        case CHIP_POLARIS11:
        case CHIP_POLARIS12:
+       case CHIP_VEGA10:
                sscreen->gs_table_depth = 32;
                return true;
        default:

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index e1286b89333c6746489a2daef1c619d83c62a34c..faafa329ef42d11b3fc6df6842c76c789e35cde8 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -2391,6 +2391,7 @@ static void si_init_tess_factor_ring(struct si_context *sctx)
                max_offchip_buffers = MIN2(max_offchip_buffers, 126);
                break;
        case CIK:
+       case GFX9:
                max_offchip_buffers = MIN2(max_offchip_buffers, 508);
                break;
        case VI: