geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: Change gralloc_handle_t members to be fixed width 

In order to lessen future alignment issues, lets switch to
fixed width integers where possible.

This excludes the data_owner since it is a pid_t which
in theory could be larger than 32 bits.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Rob Herring <robh@kernel.org>
main
Robert Foss 2018-01-16 18:07:15 +01:00
parent 8e00d5ffbd
commit e75e0ea2e3
No known key found for this signature in database
GPG Key ID: B79A0B6A11EEF727
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
android/gralloc_handle.h
View File

@ -51,15 +51,15 @@ struct gralloc_handle_t {
int prime_fd; int prime_fd;
/* api variables */ /* api variables */
const int magic; /* differentiate between allocator impls */ const uint32_t magic; /* differentiate between allocator impls */
const uint32_t version; /* api version */ const uint32_t version; /* api version */
int width; /* width of buffer in pixels */ uint32_t width; /* width of buffer in pixels */
int height; /* height of buffer in pixels */ uint32_t height; /* height of buffer in pixels */
int format; /* pixel format (Android) */ uint32_t format; /* pixel format (Android) */
int usage; /* android libhardware usage flags */ uint32_t usage; /* android libhardware usage flags */
int stride; /* the stride in bytes */ uint32_t stride; /* the stride in bytes */
uint64_t modifier; /* buffer modifiers */ uint64_t modifier; /* buffer modifiers */
int data_owner; /* owner of data (for validation) */ int data_owner; /* owner of data (for validation) */
@ -69,7 +69,7 @@ struct gralloc_handle_t {
} __attribute__((aligned(8))); } __attribute__((aligned(8)));
}; };
#define GRALLOC_HANDLE_VERSION 2 #define GRALLOC_HANDLE_VERSION 3
#define GRALLOC_HANDLE_MAGIC 0x60585350 #define GRALLOC_HANDLE_MAGIC 0x60585350
#define GRALLOC_HANDLE_NUM_FDS 1 #define GRALLOC_HANDLE_NUM_FDS 1
#define GRALLOC_HANDLE_NUM_INTS ( \ #define GRALLOC_HANDLE_NUM_INTS ( \
@ -79,8 +79,10 @@ struct gralloc_handle_t {
/** /**
* Create a buffer handle. * Create a buffer handle.
*/ */
static struct gralloc_handle_t gralloc_handle_create(int width, int height, static struct gralloc_handle_t gralloc_handle_create(int32_t width,
int format, int usage) int32_t height,
int32_t format,
int32_t usage)
{ {
struct alloc_handle_t handle = { struct alloc_handle_t handle = {
.magic = GRALLOC_HANDLE_MAGIC, .magic = GRALLOC_HANDLE_MAGIC,