diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-13 14:34:57 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-16 16:41:38 +0100 |
| commit | ea1786416c58cb0896b640bad5a9e41e1baa4011 (patch) | |
| tree | 7e187a3ce45d7b66db3f365b09607a02cf332797 /freedreno | |
| parent | dfed5e18f35e1a3b5d5b31ee11ada55a0d80abe1 (diff) | |
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 <robdclark@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'freedreno')
| -rw-r--r-- | freedreno/freedreno_bo.c | 6 | ||||
| -rw-r--r-- | freedreno/kgsl/kgsl_bo.c | 1 | ||||
| -rw-r--r-- | freedreno/kgsl/kgsl_pipe.c | 2 | ||||
| -rw-r--r-- | freedreno/msm/msm_bo.c | 1 |
4 files changed, 6 insertions, 4 deletions
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, diff --git a/freedreno/kgsl/kgsl_bo.c b/freedreno/kgsl/kgsl_bo.c index 15c3ff50..3407c769 100644 --- a/freedreno/kgsl/kgsl_bo.c +++ b/freedreno/kgsl/kgsl_bo.c @@ -168,6 +168,7 @@ drm_private struct fd_bo * kgsl_bo_from_handle(struct fd_device *dev, bo = &kgsl_bo->base; bo->funcs = &funcs; + bo->fd = -1; for (i = 0; i < ARRAY_SIZE(kgsl_bo->list); i++) list_inithead(&kgsl_bo->list[i]); diff --git a/freedreno/kgsl/kgsl_pipe.c b/freedreno/kgsl/kgsl_pipe.c index fc76b2b8..08c87a62 100644 --- a/freedreno/kgsl/kgsl_pipe.c +++ b/freedreno/kgsl/kgsl_pipe.c @@ -101,7 +101,7 @@ static void kgsl_pipe_destroy(struct fd_pipe *pipe) if (kgsl_pipe->drawctxt_id) ioctl(kgsl_pipe->fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &req); - if (kgsl_pipe->fd) + if (kgsl_pipe->fd >= 0) close(kgsl_pipe->fd); free(kgsl_pipe); diff --git a/freedreno/msm/msm_bo.c b/freedreno/msm/msm_bo.c index fbd82df7..3f5b6d07 100644 --- a/freedreno/msm/msm_bo.c +++ b/freedreno/msm/msm_bo.c @@ -137,6 +137,7 @@ drm_private struct fd_bo * msm_bo_from_handle(struct fd_device *dev, bo = &msm_bo->base; bo->funcs = &funcs; + bo->fd = -1; for (i = 0; i < ARRAY_SIZE(msm_bo->list); i++) list_inithead(&msm_bo->list[i]); |