summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Foss <robert.foss@collabora.com>2017-05-11 16:38:27 -0400
committerRobert Foss <robert.foss@collabora.com>2017-05-18 11:41:03 -0400
commit3487b28f85be98a3b0392d76b35a479a748e3ea5 (patch)
treeb8e7e1234d2b3295a91b6d35ddff5e1eb246efb1
parent7979b04bb8d074255083bd2ccb3c906ed936554d (diff)
downloadgbm_gralloc-3487b28f85be98a3b0392d76b35a479a748e3ea5.tar.gz
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 <robert.foss@collabora.com>
-rw-r--r--gralloc_drm_handle.h15
-rw-r--r--gralloc_gbm.cpp14
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)