radv: only requires LLVM 9 for GFX10 if not using ACO

In case someone links RADV with LLVM 8 and wants to use ACO.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5454>
This commit is contained in:
Samuel Pitoiset 2020-06-13 14:23:17 +02:00 committed by Marge Bot
parent 4cf4fe9d82
commit fa149b996d
2 changed files with 3 additions and 1 deletions

View file

@ -46,7 +46,7 @@ do_winsys_init(struct radv_amdgpu_winsys *ws, int fd)
return false;
/* LLVM 9.0 is required for GFX10. */
if (ws->info.chip_class == GFX10 && LLVM_VERSION_MAJOR < 9) {
if (ws->info.chip_class == GFX10 && !ws->use_aco && LLVM_VERSION_MAJOR < 9) {
fprintf(stderr, "radv: Navi family support requires LLVM 9 or higher\n");
return false;
}
@ -188,6 +188,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags)
ws->use_local_bos = perftest_flags & RADV_PERFTEST_LOCAL_BOS;
ws->zero_all_vram_allocs = debug_flags & RADV_DEBUG_ZERO_VRAM;
ws->use_aco = perftest_flags & RADV_PERFTEST_ACO;
list_inithead(&ws->global_bo_list);
pthread_mutex_init(&ws->global_bo_list_lock, NULL);
ws->base.query_info = radv_amdgpu_winsys_query_info;

View file

@ -46,6 +46,7 @@ struct radv_amdgpu_winsys {
bool use_ib_bos;
bool zero_all_vram_allocs;
bool use_local_bos;
bool use_aco;
unsigned num_buffers;
pthread_mutex_t global_bo_list_lock;