Mesa (master): radv/winsys: Remove use_local_bos

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8ddbac03770906213c9179dda8149d8bbffa4bd4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ddbac03770906213c9179dda8149d8bbffa4bd4

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Wed Apr 14 15:43:12 2021 +0200

radv/winsys: Remove use_local_bos

Now that perftest is stored in the winsys.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10198>

---

 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c     | 3 ++-
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 1 -
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
index e96bcf23ee8..e612dd579dc 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 
 #include "radv_amdgpu_bo.h"
+#include "radv_debug.h"
 
 #include <amdgpu.h>
 #include <inttypes.h>
@@ -486,7 +487,7 @@ radv_amdgpu_winsys_bo_create(struct radeon_winsys *_ws, uint64_t size, unsigned
    if (!(flags & RADEON_FLAG_IMPLICIT_SYNC))
       request.flags |= AMDGPU_GEM_CREATE_EXPLICIT_SYNC;
    if (flags & RADEON_FLAG_NO_INTERPROCESS_SHARING &&
-       (ws->use_local_bos || (flags & RADEON_FLAG_PREFER_LOCAL_BO))) {
+       ((ws->perftest & RADV_PERFTEST_LOCAL_BOS) || (flags & RADEON_FLAG_PREFER_LOCAL_BO))) {
       bo->base.is_local = true;
       request.flags |= AMDGPU_GEM_CREATE_VM_ALWAYS_VALID;
    }
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index 422b5d05dc4..28e71b161ad 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -236,7 +236,6 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags)
       ws->use_ib_bos = false;
 
    ws->perftest = 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_llvm = debug_flags & RADV_DEBUG_LLVM;
    u_rwlock_init(&ws->global_bo_list.lock);
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
index d124e04a0f6..3f8b4ecdb12 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -47,7 +47,6 @@ struct radv_amdgpu_winsys {
    bool debug_log_bos;
    bool use_ib_bos;
    bool zero_all_vram_allocs;
-   bool use_local_bos;
    bool use_llvm;
    uint64_t perftest;