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 <bas@basnieuwenhuizen.nl>
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 ee5fc89a2dfa92c9e96c52061873b56e3a215a5e..d9d8d9124f5bcb6163cd3109f9364dc8f9293d3d 100644 (file)
--- 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 5b3f71510136d4f1f394cf15a2549c2fb66e19a3..90c7d2639eea10fefdc8d8c418008dfa5cd9b7b3 100644 (file)
--- 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 d80d74628b10c10bce4e47404e2e9672a8bdcdb3..59ce2d02a55c374f5168f3198ce9751f5849eb5a 100644 (file)
--- 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 376de71d755f0cf5fa404bd3ef5fd2979703fc1d..df0498d1c3b8b9e3daf6004095bb518fc6d68e1c 100644 (file)
--- 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 3282652ddd49cb12f6a7ee029f41bc30eff8258c..ffedf2377691af52f52874cf3578dee5bfad83e6 100644 (file)
--- 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 e7ad4e0e87ea38092b529492936d49fa63b83941..d111c988814eee1b009d7201aec35a816425999c 100644 (file)
--- 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"