Mesa (master): radv: add the custom border color BO to the list of buffers

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Jul 13 20:09:15 2020 +0200

radv: add the custom border color BO to the list of buffers

The buffer was never added to the list of buffers. This might lead to
VM faults and GPU hangs.

Found this by luck.

Fixes: 57e796a12a8 ("radv: Implement VK_EXT_custom_border_color")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5884>

---

 src/amd/vulkan/radv_device.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index dee12f98e2d..9fc0668761e 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3591,6 +3591,10 @@ radv_get_preamble_cs(struct radv_queue *queue,
 		if (queue->device->trace_bo)
 			radv_cs_add_buffer(queue->device->ws, cs, queue->device->trace_bo);
 
+		if (queue->device->border_color_data.bo)
+			radv_cs_add_buffer(queue->device->ws, cs,
+					   queue->device->border_color_data.bo);
+
 		if (i == 0) {
 			si_cs_emit_cache_flush(cs,
 			                       queue->device->physical_device->rad_info.chip_class,