Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> Maybe nominate for stable too?
On Fri, May 5, 2017 at 2:28 AM, Dave Airlie <airl...@gmail.com> wrote: > From: Dave Airlie <airl...@redhat.com> > > 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. > > Signed-off-by: Dave Airlie <airl...@redhat.com> > --- > src/amd/common/ac_llvm_util.c | 1 + > src/amd/vulkan/radv_device.c | 1 + > src/amd/vulkan/si_cmd_buffer.c | 1 + > src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 5 +++++ > 4 files changed, 8 insertions(+) > > diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c > index 8827975..e20456e 100644 > --- 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 648103d..921b8e4 100644 > --- 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 41625aa..1382272 100644 > --- 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 783567f..629da31 100644 > --- 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; > -- > 2.9.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
