OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac: treat Mullins as Kabini, remove the enum

Browse Source 
it's the same design
This commit is contained in:
Marek Olšák
2019-05-15 14:33:34 -04:00
parent 37af75f88c
commit b257956021
10 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/pci_ids/radeonsi_pci_ids.h
View File

@@ -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)

2
src/amd/common/ac_gpu_info.c
View File

@@ -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;

2
src/amd/common/ac_llvm_util.c
View File

@@ -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:

4
src/amd/common/ac_surface.c
View File

@@ -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);

1
src/amd/common/amd_family.h
View File

@@ -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,

1
src/amd/vulkan/radv_device.c
View File

@@ -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;

3
src/amd/vulkan/radv_pipeline.c
View File

@@ -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);
}

6
src/gallium/drivers/radeonsi/cik_sdma.c
View File

@@ -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)))) {

3
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -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);
}

3
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
View File

@@ -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: