From 3487b28f85be98a3b0392d76b35a479a748e3ea5 Mon Sep 17 00:00:00 2001 From: Robert Foss Date: Thu, 11 May 2017 16:38:27 -0400 Subject: Move definition of gralloc_gbm_bo_t This fixes issue where drm_hwcomposer carried a local definition of this struct. Signed-off-by: Robert Foss --- gralloc_drm_handle.h | 15 +++++++++++++++ gralloc_gbm.cpp | 14 -------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/gralloc_drm_handle.h b/gralloc_drm_handle.h index cd69a4c..3bc5700 100644 --- a/gralloc_drm_handle.h +++ b/gralloc_drm_handle.h @@ -56,6 +56,21 @@ struct gralloc_drm_handle_t { uint64_t reserved; } __attribute__((aligned(8))); }; + +struct gralloc_gbm_bo_t { + struct gbm_bo *bo; + void *map_data; + + struct gralloc_gbm_handle_t *handle; + + int imported; /* the handle is from a remote proces when true */ + + int lock_count; + int locked_for; + + unsigned int refcount; +}; + #define GRALLOC_GBM_HANDLE_MAGIC 0x5f47424d #define GRALLOC_GBM_HANDLE_NUM_FDS 1 #define GRALLOC_GBM_HANDLE_NUM_INTS ( \ diff --git a/gralloc_gbm.cpp b/gralloc_gbm.cpp index ea1035f..5dc9f00 100644 --- a/gralloc_gbm.cpp +++ b/gralloc_gbm.cpp @@ -46,20 +46,6 @@ #define unlikely(x) __builtin_expect(!!(x), 0) -struct gralloc_gbm_bo_t { - struct gbm_bo *bo; - void *map_data; - - struct gralloc_gbm_handle_t *handle; - - int imported; /* the handle is from a remote proces when true */ - - int lock_count; - int locked_for; - - unsigned int refcount; -}; - static int32_t gralloc_gbm_pid = 0; static uint32_t get_gbm_format(int format) -- cgit v1.2.3