Mesa (staging/20.0): radv: report INITIALIZATION_FAILED when the amdgpu winsys init failed

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 5f3ab97cb88a5aa926b87116a0ef79882258bd42
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f3ab97cb88a5aa926b87116a0ef79882258bd42

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Apr 29 13:24:36 2020 +0200

radv: report INITIALIZATION_FAILED when the amdgpu winsys init failed

The driver should be capable if it reaches the winsys initialization.

Cc: <mesa-stable at lists.freedesktop.org>
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/4806>
(cherry picked from commit f03abd504102fc71ec0b18704a2ea3a92542b5f8)

---

 .pick_status.json            | 2 +-
 src/amd/vulkan/radv_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 24ad6d57967..fbbf814a8cd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -355,7 +355,7 @@
         "description": "radv: report INITIALIZATION_FAILED when the amdgpu winsys init failed",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 4863257ea59..901a0f71824 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -370,7 +370,7 @@ radv_physical_device_init(struct radv_physical_device *device,
 	device->ws = radv_amdgpu_winsys_create(fd, instance->debug_flags,
 					       instance->perftest_flags);
 	if (!device->ws) {
-		result = vk_error(instance, VK_ERROR_INCOMPATIBLE_DRIVER);
+		result = vk_error(instance, VK_ERROR_INITIALIZATION_FAILED);
 		goto fail;
 	}