From 3882f3da22a1b12d39ed7f7c20a7009fb1b8d134 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 31 Jan 2017 10:37:25 +1000 Subject: radv/geom: check if esgs and gsvs ring exists before filling geom rings There are some corner cases where you end up with an esgs ring, but no gsvs ring, test for both before dereferencing. Fixes: dEQP-VK.geometry.emit.points_emit_0_end_0 Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Dave Airlie --- src/amd/vulkan/radv_device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/amd/vulkan/radv_device.c') diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 2014ce23b8c..da67b65ef43 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1058,11 +1058,14 @@ fill_geom_rings(struct radv_queue *queue, uint32_t gsvs_ring_size, struct radeon_winsys_bo *gsvs_ring_bo) { - uint64_t esgs_va, gsvs_va; - esgs_va = queue->device->ws->buffer_get_va(esgs_ring_bo); - gsvs_va = queue->device->ws->buffer_get_va(gsvs_ring_bo); + uint64_t esgs_va = 0, gsvs_va = 0; uint32_t *desc = &map[4]; + if (esgs_ring_bo) + esgs_va = queue->device->ws->buffer_get_va(esgs_ring_bo); + if (gsvs_ring_bo) + gsvs_va = queue->device->ws->buffer_get_va(gsvs_ring_bo); + /* stride 0, num records - size, add tid, swizzle, elsize4, index stride 64 */ desc[0] = esgs_va; -- cgit v1.2.3