radv: enable POLARIS12 support.

This just adds the chip in the right places.

We don't set the partial_vs_wave workaround, as radeonsi
doesn't, but have to confirm it's not required.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: "17.1" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c
index 88279754a438e59d2c51978a248b433b462d7d52..e20456e2ff8f85e096ac7351f2d65b215cf06501 100644 (file)
--- a/src/amd/common/ac_llvm_util.c
+++ b/src/amd/common/ac_llvm_util.c
@@ -108,6 +108,7 @@ static const char *ac_get_llvm_processor_name(enum radeon_family family)
        case CHIP_POLARIS10:
                return "polaris10";
        case CHIP_POLARIS11:
+       case CHIP_POLARIS12:
                return "polaris11";
        default:
                return "";

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 648103d2c79d8d90a74efd809a0e53bc74fad4e1..921b8e48f5b5aeeaee8bb0cd237c72fb89d9d0a3 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -917,6 +917,7 @@ radv_device_init_gs_info(struct radv_device *device)
        case CHIP_FIJI:
        case CHIP_POLARIS10:
        case CHIP_POLARIS11:
+       case CHIP_POLARIS12:
                device->gs_table_depth = 32;
                return;
        default:

diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 41625aa132dc5b4b8989d45117b757327883db44..1382272d71b01467c6d5eb7c7eaac4d64c23d940 100644 (file)
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -297,6 +297,7 @@ si_emit_config(struct radv_physical_device *physical_device,
                raster_config_1 = 0x0000002a;
                break;
        case CHIP_POLARIS11:
+       case CHIP_POLARIS12:
                raster_config = 0x16000012;
                raster_config_1 = 0x00000000;
                break;

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index 783567fa5b4fd0cfb73e21b7c04121113facb9e1..629da31538faf22bca5001dc74fdd9f111042367 100644 (file)
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -107,6 +107,7 @@ get_chip_name(enum radeon_family family)
        case CHIP_FIJI: return "AMD RADV FIJI";
        case CHIP_POLARIS10: return "AMD RADV POLARIS10";
        case CHIP_POLARIS11: return "AMD RADV POLARIS11";
+       case CHIP_POLARIS12: return "AMD RADV POLARIS12";
        case CHIP_STONEY: return "AMD RADV STONEY";
        default: return "AMD RADV unknown";
        }
@@ -271,6 +272,10 @@ do_winsys_init(struct radv_amdgpu_winsys *ws, int fd)
                ws->family = FAMILY_VI;
                ws->rev_id = VI_POLARIS11_M_A0;
                break;
+       case CHIP_POLARIS12:
+               ws->family = FAMILY_VI;
+               ws->rev_id = VI_POLARIS12_V_A0;
+               break;
        default:
                fprintf(stderr, "amdgpu: Unknown family.\n");
                goto fail;