diff options
| author | Dave Airlie <[email protected]> | 2017-06-06 08:33:53 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2017-06-06 09:43:21 +1000 |
| commit | 0063da8393cb71a3db014371f0d26121ccfb11f8 (patch) | |
| tree | 5debf46e58038c06933246d4509ffcc6631814d1 | |
| parent | a83f28d536d97615047f29ffb5f651a8afafb568 (diff) | |
radv: add some misc gfx9 pieces.
This just adds the strings and includes the gfx9 register defs
in some files that we need them in.
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/amd/common/ac_llvm_util.c | 3 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 6 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 1 | ||||
| -rw-r--r-- | src/amd/vulkan/si_cmd_buffer.c | 1 |
6 files changed, 13 insertions, 0 deletions
diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c index ee5fc89a2df..d9d8d9124f5 100644 --- a/src/amd/common/ac_llvm_util.c +++ b/src/amd/common/ac_llvm_util.c @@ -110,6 +110,9 @@ static const char *ac_get_llvm_processor_name(enum radeon_family family) case CHIP_POLARIS11: case CHIP_POLARIS12: return "polaris11"; + case CHIP_VEGA10: + case CHIP_RAVEN: + return "gfx900"; default: return ""; } diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 5b3f7151013..90c7d2639ee 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -29,6 +29,7 @@ #include "radv_radeon_winsys.h" #include "radv_cs.h" #include "sid.h" +#include "gfx9d.h" #include "vk_format.h" #include "radv_meta.h" diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index d80d74628b1..59ce2d02a55 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -42,6 +42,7 @@ #include "ac_llvm_util.h" #include "vk_format.h" #include "sid.h" +#include "gfx9d.h" #include "util/debug.h" static int @@ -230,6 +231,8 @@ get_chip_name(enum radeon_family family) case CHIP_POLARIS11: return "AMD RADV POLARIS11"; case CHIP_POLARIS12: return "AMD RADV POLARIS12"; case CHIP_STONEY: return "AMD RADV STONEY"; + case CHIP_VEGA10: return "AMD RADV VEGA"; + case CHIP_RAVEN: return "AMD RADV RAVEN"; default: return "AMD RADV unknown"; } } @@ -975,6 +978,8 @@ radv_device_init_gs_info(struct radv_device *device) case CHIP_POLARIS10: case CHIP_POLARIS11: case CHIP_POLARIS12: + case CHIP_VEGA10: + case CHIP_RAVEN: device->gs_table_depth = 32; return; default: @@ -1476,6 +1481,7 @@ radv_get_hs_offchip_param(struct radv_device *device, uint32_t *max_offchip_buff break; case CIK: case VI: + case GFX9: default: max_offchip_buffers = MIN2(max_offchip_buffers, 508); break; diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 376de71d755..df0498d1c3b 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -29,6 +29,7 @@ #include "vk_format.h" #include "radv_radeon_winsys.h" #include "sid.h" +#include "gfx9d.h" #include "util/debug.h" static unsigned radv_choose_tiling(struct radv_device *Device, diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 3282652ddd4..ffedf237769 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -35,6 +35,7 @@ #include <llvm-c/TargetMachine.h> #include "sid.h" +#include "gfx9d.h" #include "r600d_common.h" #include "ac_binary.h" #include "ac_llvm_util.h" diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index e7ad4e0e87e..d111c988814 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -30,6 +30,7 @@ #include "radv_private.h" #include "radv_cs.h" #include "sid.h" +#include "gfx9d.h" #include "radv_util.h" #include "main/macros.h" |