From 67db4ad07f74a4ed6fc11a170afef4243f4c740d Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Thu, 11 Feb 2021 20:32:00 +0100 Subject: [PATCH] radv: Ignore WC flags for VRAM. Otherwise there might be buffers for which we don't have a type. Fixes: 7262c743dc8 ("radv: Determine memory type for import based on fd.") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4280 Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit 045a85085afeed0afae1969a6fc52610f060bab5) --- .pick_status.json | 2 +- src/amd/vulkan/radv_device.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 12904f71f0e..c23f5aa2cdb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3334,7 +3334,7 @@ "description": "radv: Ignore WC flags for VRAM.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "7262c743dc84d4efa778658bb77b10850c29e014" }, diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index a52b9177498..e49245e7ad3 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -7797,6 +7797,11 @@ static uint32_t radv_compute_valid_memory_types(struct radv_physical_device *dev enum radeon_bo_flag ignore_flags = ~(RADEON_FLAG_NO_CPU_ACCESS | RADEON_FLAG_GTT_WC); uint32_t bits = radv_compute_valid_memory_types_attempt(dev, domains, flags, ignore_flags); + if (!bits) { + ignore_flags |= RADEON_FLAG_GTT_WC; + bits = radv_compute_valid_memory_types_attempt(dev, domains, flags, ignore_flags); + } + if (!bits) { ignore_flags |= RADEON_FLAG_NO_CPU_ACCESS; bits = radv_compute_valid_memory_types_attempt(dev, domains, flags, ignore_flags);