diff options
| author | Marek Olšák <[email protected]> | 2019-05-15 14:33:34 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-05-27 15:10:51 -0400 |
| commit | b25795602160af020d6bec30c88207a544a73ae9 (patch) | |
| tree | 4317ffca01a65cfbdab5ebe37a36eb53727ffc74 /src/amd/vulkan | |
| parent | 37af75f88c8c1daf67f3d4747613040a6dd9caf8 (diff) | |
ac: treat Mullins as Kabini, remove the enum
it's the same design
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 4203074a4cd..c50908bcfcb 100644 --- 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 56fd65bec29..a3076d421a5 100644 --- 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); } |