[Mesa-dev] [PATCH 22/24] radv: stop using radv_amdgpu_winsys::family

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haeh...@amd.com>

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

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c 
b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index cbfd0d1..5ea1218 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -809,21 +809,21 @@ static int radv_amdgpu_winsys_cs_submit_sysmem(struct 
radeon_winsys_ctx *_ctx,
 {
        int r;
        struct radv_amdgpu_ctx *ctx = radv_amdgpu_ctx(_ctx);
        struct radv_amdgpu_fence *fence = (struct radv_amdgpu_fence *)_fence;
        struct radv_amdgpu_cs *cs0 = radv_amdgpu_cs(cs_array[0]);
        struct radeon_winsys *ws = (struct radeon_winsys*)cs0->ws;
        amdgpu_bo_list_handle bo_list;
        struct amdgpu_cs_request request;
        uint32_t pad_word = 0xffff1000U;
 
-       if (radv_amdgpu_winsys(ws)->family == FAMILY_SI)
+       if (radv_amdgpu_winsys(ws)->info.chip_class == SI)
                pad_word = 0x80000000;
 
        assert(cs_count);
 
        for (unsigned i = 0; i < cs_count;) {
                struct amdgpu_cs_ib_info ib = {0};
                struct radeon_winsys_bo *bo = NULL;
                struct radeon_winsys_cs *preamble_cs = i ? continue_preamble_cs 
: initial_preamble_cs;
                uint32_t *ptr;
                unsigned cnt = 0;
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c 
b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index 2ebb856..31b0db9 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -131,21 +131,21 @@ do_winsys_init(struct radv_amdgpu_winsys *ws, int fd)
 
        ws->addrlib = radv_amdgpu_addr_create(&ws->amdinfo, ws->family, 
ws->rev_id, ws->info.chip_class);
        if (!ws->addrlib) {
                fprintf(stderr, "amdgpu: Cannot create addrlib.\n");
                goto fail;
        }
 
        ws->info.num_sdma_rings = MIN2(ws->info.num_sdma_rings, 
MAX_RINGS_PER_TYPE);
        ws->info.num_compute_rings = MIN2(ws->info.num_compute_rings, 
MAX_RINGS_PER_TYPE);
 
-       ws->use_ib_bos = ws->family >= FAMILY_CI;
+       ws->use_ib_bos = ws->info.chip_class >= CIK;
        return true;
 fail:
        return false;
 }
 
 static void radv_amdgpu_winsys_query_info(struct radeon_winsys *rws,
                                      struct radeon_info *info)
 {
        *info = ((struct radv_amdgpu_winsys *)rws)->info;
 }
-- 
2.9.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev