ac: treat Mullins as Kabini, remove the enum

it's the same design

diff --git a/include/pci_ids/radeonsi_pci_ids.h b/include/pci_ids/radeonsi_pci_ids.h
index 75ac7761bb48d0463ffff93cab8ff77e559ccf4b..65ae163f2318a768f631c2ff7561bfcc9195d4f2 100644 (file)
--- a/include/pci_ids/radeonsi_pci_ids.h
+++ b/include/pci_ids/radeonsi_pci_ids.h
@@ -105,22 +105,22 @@ CHIPSET(0x983D, KABINI)
 CHIPSET(0x983E, KABINI)
 CHIPSET(0x983F, KABINI)
 
-CHIPSET(0x9850, MULLINS)
-CHIPSET(0x9851, MULLINS)
-CHIPSET(0x9852, MULLINS)
-CHIPSET(0x9853, MULLINS)
-CHIPSET(0x9854, MULLINS)
-CHIPSET(0x9855, MULLINS)
-CHIPSET(0x9856, MULLINS)
-CHIPSET(0x9857, MULLINS)
-CHIPSET(0x9858, MULLINS)
-CHIPSET(0x9859, MULLINS)
-CHIPSET(0x985A, MULLINS)
-CHIPSET(0x985B, MULLINS)
-CHIPSET(0x985C, MULLINS)
-CHIPSET(0x985D, MULLINS)
-CHIPSET(0x985E, MULLINS)
-CHIPSET(0x985F, MULLINS)
+CHIPSET(0x9850, KABINI)
+CHIPSET(0x9851, KABINI)
+CHIPSET(0x9852, KABINI)
+CHIPSET(0x9853, KABINI)
+CHIPSET(0x9854, KABINI)
+CHIPSET(0x9855, KABINI)
+CHIPSET(0x9856, KABINI)
+CHIPSET(0x9857, KABINI)
+CHIPSET(0x9858, KABINI)
+CHIPSET(0x9859, KABINI)
+CHIPSET(0x985A, KABINI)
+CHIPSET(0x985B, KABINI)
+CHIPSET(0x985C, KABINI)
+CHIPSET(0x985D, KABINI)
+CHIPSET(0x985E, KABINI)
+CHIPSET(0x985F, KABINI)
 
 CHIPSET(0x1304, KAVERI)
 CHIPSET(0x1305, KAVERI)

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index 7c8ca9cf48deae8748394443547ab2843ad815bd..58454c5e845611f93e686a2257d61887fca36d3c 100644 (file)
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -654,7 +654,6 @@ ac_get_gs_table_depth(enum chip_class chip_class, enum radeon_family family)
        case CHIP_HAINAN:
        case CHIP_KAVERI:
        case CHIP_KABINI:
-       case CHIP_MULLINS:
        case CHIP_ICELAND:
        case CHIP_CARRIZO:
        case CHIP_STONEY:
@@ -688,7 +687,6 @@ ac_get_raster_config(struct radeon_info *info,
        /* 1 SE / 1 RB */
        case CHIP_HAINAN:
        case CHIP_KABINI:
-       case CHIP_MULLINS:
        case CHIP_STONEY:
                raster_config = 0x00000000;
                raster_config_1 = 0x00000000;

diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c
index 6063411310b849adedcb761f94cb9bf76fc04013..5b701603ebbe254bda0242bcd5a740a943c0501e 100644 (file)
--- a/src/amd/common/ac_llvm_util.c
+++ b/src/amd/common/ac_llvm_util.c
@@ -107,8 +107,6 @@ const char *ac_get_llvm_processor_name(enum radeon_family family)
                return "kaveri";
        case CHIP_HAWAII:
                return "hawaii";
-       case CHIP_MULLINS:
-               return "mullins";
        case CHIP_TONGA:
                return "tonga";
        case CHIP_ICELAND:

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index a9433b9696ce39006a8547b34d5ec0d75555dd78..28256352cb7e1593854e3a6990f780041023bd26 100644 (file)
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -95,10 +95,6 @@ static void addrlib_family_rev_id(enum radeon_family family,
                *addrlib_family = FAMILY_CI;
                *addrlib_revid = get_first(AMDGPU_HAWAII_RANGE);
                break;
-       case CHIP_MULLINS:
-               *addrlib_family = FAMILY_KV;
-               *addrlib_revid = get_first(AMDGPU_GODAVARI_RANGE);
-               break;
        case CHIP_TONGA:
                *addrlib_family = FAMILY_VI;
                *addrlib_revid = get_first(AMDGPU_TONGA_RANGE);

diff --git a/src/amd/common/amd_family.h b/src/amd/common/amd_family.h
index ee30dc74b93f0bb4c018cf96cffda287ac03e572..acc7673bee12df64b79430ed711de4c2a7f29979 100644 (file)
--- a/src/amd/common/amd_family.h
+++ b/src/amd/common/amd_family.h
@@ -83,7 +83,6 @@ enum radeon_family {
     CHIP_KAVERI,
     CHIP_KABINI,
     CHIP_HAWAII,
-    CHIP_MULLINS,
     CHIP_TONGA,    /* GFX8 (Volcanic Islands & Polaris) */
     CHIP_ICELAND,
     CHIP_CARRIZO,

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 4203074a4cdaf69529454af0fc99f4d91201604d..c50908bcfcb09fac34c4e82461ca040642b25ea1 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -100,7 +100,6 @@ radv_get_device_name(enum radeon_family family, char *name, size_t name_len)
        case CHIP_KAVERI: chip_string = "AMD RADV KAVERI"; break;
        case CHIP_KABINI: chip_string = "AMD RADV KABINI"; break;
        case CHIP_HAWAII: chip_string = "AMD RADV HAWAII"; break;
-       case CHIP_MULLINS: chip_string = "AMD RADV MULLINS"; break;
        case CHIP_TONGA: chip_string = "AMD RADV TONGA"; break;
        case CHIP_ICELAND: chip_string = "AMD RADV ICELAND"; break;
        case CHIP_CARRIZO: chip_string = "AMD RADV CARRIZO"; break;

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 56fd65bec29ca1507c80ce259636c2118f22ab22..a3076d421a53eae037381796d822f0e4d0fb285f 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -1600,8 +1600,7 @@ static void si_multiwave_lds_size_workaround(struct radv_device *device,
         *   It applies to workgroup sizes of more than one wavefront.
         */
        if (device->physical_device->rad_info.family == CHIP_BONAIRE ||
-           device->physical_device->rad_info.family == CHIP_KABINI ||
-           device->physical_device->rad_info.family == CHIP_MULLINS)
+           device->physical_device->rad_info.family == CHIP_KABINI)
                *lds_size = MAX2(*lds_size, 8);
 }
 

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index 2728541dd29d5a953dae13d5a525510ac44fc378..ba62295318f63d4a7bd20e147830533a8db3dbe4 100644 (file)
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -272,8 +272,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx,
 
                if ((sctx->family == CHIP_BONAIRE ||
                     sctx->family == CHIP_KAVERI ||
-                    sctx->family == CHIP_KABINI ||
-                    sctx->family == CHIP_MULLINS) &&
+                    sctx->family == CHIP_KABINI) &&
                    (tiled_x + copy_width == (1 << 14) ||
                     tiled_y + copy_height == (1 << 14)))
                        return false;
@@ -442,8 +441,7 @@ static bool cik_sdma_copy_texture(struct si_context *sctx,
                    /* HW limitation - some GFX7 parts: */
                    ((sctx->family != CHIP_BONAIRE &&
                      sctx->family != CHIP_KAVERI &&
-                     sctx->family != CHIP_KABINI &&
-                     sctx->family != CHIP_MULLINS) ||
+                     sctx->family != CHIP_KABINI) ||
                     (srcx + copy_width_aligned != (1 << 14) &&
                      srcy + copy_height_aligned != (1 << 14) &&
                      dstx + copy_width != (1 << 14)))) {

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 7260a6b8df69297131d68e19b44827df2c9d526a..d2927d0254b8bed7b5c74017f6fde8bfb5f258d0 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -7932,8 +7932,7 @@ void si_multiwave_lds_size_workaround(struct si_screen *sscreen,
         *   It applies to workgroup sizes of more than one wavefront.
         */
        if (sscreen->info.family == CHIP_BONAIRE ||
-           sscreen->info.family == CHIP_KABINI ||
-           sscreen->info.family == CHIP_MULLINS)
+           sscreen->info.family == CHIP_KABINI)
                *lds_size = MAX2(*lds_size, 8);
 }
 

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index 99ecbea283bdaf123b1e204b18f146420583ec39..7aa45b52639d00aa9fceab2a62f7d065bfaccebb 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -275,7 +275,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
     case CHIP_KAVERI:
     case CHIP_KABINI:
     case CHIP_HAWAII:
-    case CHIP_MULLINS:
         ws->info.chip_class = GFX7;
         break;
     }
@@ -296,7 +295,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
     case CHIP_ARUBA:
     case CHIP_KAVERI:
     case CHIP_KABINI:
-    case CHIP_MULLINS:
        ws->info.has_dedicated_vram = false;
        break;
 
@@ -482,7 +480,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
     switch (ws->info.family) {
     case CHIP_HAINAN:
     case CHIP_KABINI:
-    case CHIP_MULLINS:
         ws->info.num_tcc_blocks = 2;
         break;
     case CHIP_VERDE: