commit cdb5bcc0598e4c97ecb5e0056578095329fb797f
author Vinson Lee <vlee@freedesktop.org> Sun Nov 08 15:59:55 2020 -0800
committer Dylan Baker <dylan.c.baker@intel.com> Fri Nov 13 10:05:41 2020 -0800
tree fdce6914ef79a191aad01afdafecef8dee918469
parent 0724abde7a333bf62c59c930d7b340da8ca145d5

turnip: Fix file descriptor return.

Fix defect reported by Coverity Scan.

Logically dead code (DEADCODE)
dead_error_line: Execution cannot reach the expression -1 inside this statement: return ret ? -1 : handle.fd;

Fixes: cec0bc73e55 ("turnip: rework fences to use syncobjs")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7498>
(cherry picked from commit dad6b625768f2b68e1ea5c31da4e0e1415ef41bb)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 8cb0f67..f45a9d4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -454,7 +454,7 @@
         "description": "turnip: Fix file descriptor return.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "cec0bc73e550859635a71d330625bccdf71e87ee"
     },

src/freedreno/vulkan/tu_drm.c

diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_drm.c
index 34b337f..a45cfcd 100644
--- a/src/freedreno/vulkan/tu_drm.c
+++ b/src/freedreno/vulkan/tu_drm.c
@@ -913,8 +913,6 @@
    int ret;
 
    ret = ioctl(device->fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, &handle);
-   if (ret)
-      return 0;
 
    return ret ? -1 : handle.fd;
 }