From ea1786416c58cb0896b640bad5a9e41e1baa4011 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 13 Jul 2015 14:34:57 +0100 Subject: freedreno: zero is a valid fd number, treat it as such Abeit quite unlikely to get hit by this bug here, let just fix it. v2: Correct conditional (do not call ioctl(DRM_IOCTL_PRIME_HANDLE_TO_FD) when we already have the fd). v3: Fix kgsl_pipe.c, suggested by Thierry. Cc: freedreno@lists.freedesktop.org Cc: Rob Clark Signed-off-by: Emil Velikov Reviewed-by: Thierry Reding --- freedreno/freedreno_bo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'freedreno/freedreno_bo.c') diff --git a/freedreno/freedreno_bo.c b/freedreno/freedreno_bo.c index 517a2f81..eec218c6 100644 --- a/freedreno/freedreno_bo.c +++ b/freedreno/freedreno_bo.c @@ -285,9 +285,9 @@ void fd_bo_del(struct fd_bo *bo) if (!atomic_dec_and_test(&bo->refcnt)) return; - if (bo->fd) { + if (bo->fd >= 0) { close(bo->fd); - bo->fd = 0; + bo->fd = -1; } pthread_mutex_lock(&table_lock); @@ -372,7 +372,7 @@ uint32_t fd_bo_handle(struct fd_bo *bo) int fd_bo_dmabuf(struct fd_bo *bo) { - if (!bo->fd) { + if (bo->fd < 0) { struct drm_prime_handle req = { .handle = bo->handle, .flags = DRM_CLOEXEC, -- cgit v1.2.3