diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-05-05 10:27:33 +1000 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-05-12 21:54:56 +0300 |
| commit | 6c9734a13d201cf00441f02bf21756704bdee09f (patch) | |
| tree | 932392ca5924771f65c6278a7eec2b458f01b65e | |
| parent | 3dea3a38bd744ac3c9e0c77c2cad99112d96fda3 (diff) | |
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>
(cherry picked from commit a096d8d3f7a8c6dffc91b2ac1794fdd215c054d3)
[Andres Gomez: dropped code that didn't make it for 17.0]
Signed-off-by: Andres Gomez <agomez@igalia.com>
Conflicts:
src/amd/vulkan/radv_device.c
| -rw-r--r-- | src/amd/common/ac_llvm_util.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/si_cmd_buffer.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c index 770e3bd13c1..0ffd18c9dbd 100644 --- a/src/amd/common/ac_llvm_util.c +++ b/src/amd/common/ac_llvm_util.c @@ -119,6 +119,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"; #endif default: diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index 5abb12103a5..52f48bdc531 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -291,6 +291,7 @@ void si_init_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 35b6bc57a42..0428ce07425 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c @@ -106,6 +106,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"; } @@ -270,6 +271,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; |