radv: stop using radv_amdgpu_winsys::family

Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index cbfd0d1a8e2191921a44c4e772a6dba14a345813..5ea12188e879f7a0e7e873587ac01f77a6ead63f 100644 (file)
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -816,7 +816,7 @@ static int radv_amdgpu_winsys_cs_submit_sysmem(struct radeon_winsys_ctx *_ctx,
        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);

diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index 2ebb85699a89a9bef9b1bf4f0d3d6372fcbf758b..31b0db976362c4cb9a8ce3a6aea36bb47f04ae4e 100644 (file)
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -138,7 +138,7 @@ do_winsys_init(struct radv_amdgpu_winsys *ws, int fd)
        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;