diff options
author | Eric Anholt <eric@anholt.net> | 2015-06-18 11:15:40 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2015-11-06 12:38:10 -0800 |
commit | 91b0c1cf3df0ff94a64a6a6a4d7353c74e4dd358 (patch) | |
tree | 3ad65067965ca43ca61c55096f599a7fa740cfdb | |
parent | 549952a8e2176265caf02b79b70cfbd5d60cf70e (diff) |
glamor: Use the GBM function for getting an FD from a GBM BO.
We were rolling ioctl calls ourselves, when there's a nice interface
for it.
Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | glamor/glamor_egl.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 761874f84..658014120 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -368,22 +368,7 @@ glamor_egl_create_textured_pixmap_from_gbm_bo(PixmapPtr pixmap, void *bo) } #ifdef GLAMOR_HAS_GBM -int glamor_get_fd_from_bo(int gbm_fd, struct gbm_bo *bo, int *fd); void glamor_get_name_from_bo(int gbm_fd, struct gbm_bo *bo, int *name); -int -glamor_get_fd_from_bo(int gbm_fd, struct gbm_bo *bo, int *fd) -{ - union gbm_bo_handle handle; - struct drm_prime_handle args; - - handle = gbm_bo_get_handle(bo); - args.handle = handle.u32; - args.flags = DRM_CLOEXEC; - if (ioctl(gbm_fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args)) - return FALSE; - *fd = args.fd; - return TRUE; -} void glamor_get_name_from_bo(int gbm_fd, struct gbm_bo *bo, int *name) @@ -495,8 +480,7 @@ glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen, glamor_get_name_from_bo(glamor_egl->fd, bo, &fd); } else { - if (glamor_get_fd_from_bo(glamor_egl->fd, bo, &fd)) { - } + fd = gbm_bo_get_fd(bo); } *stride = pixmap->devKind; *size = pixmap->devKind * gbm_bo_get_height(bo); |