Mesa (master): radv: stop using radv_amdgpu_winsys::family

[Dave Airlie]

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

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Fri May 12 01:38:30 2017 +0200

radv: stop using radv_amdgpu_winsys::family

Reviewed-by: Dave Airlie <airlied at redhat.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 cbfd0d1a8e..5ea12188e8 100644
--- 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 2ebb85699a..31b0db9763 100644
--- 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;