summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2019-02-28 10:00:25 -0800
committerJohn Stultz <john.stultz@linaro.org>2019-02-28 10:05:32 -0800
commit91d8213c9233c8c37bd8a0e2259d4aebd4618512 (patch)
tree882484864b1503559e82f1bb4b75d4d82eb1d05e
parent35a7a376674552e014d880b58a95c0a0a296666f (diff)
downloadhikey-91d8213c9233c8c37bd8a0e2259d4aebd4618512.tar.gz
hikey: gralloc: Add element to allow upstream drm_hwc to build w/ HiKey
Upstream drm_hwc merged some changes to support AFBC which is only supported on HiKey960. In doing so they utilize a hikey960 gralloc private handle field that doesn't exist on HiKey. Thus this patch adds the internal_format field as a union element on format. This is a union element so we don't change the structure size and since internal_format isn't used in drm_hwc when building with w/ HiKey there is no effect on the values it aliases. Change-Id: Ie73706d8f3acfaf3bfa5c187c0365d505da044d2 Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--gralloc/gralloc_priv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h
index 3330eae8..14cb07a8 100644
--- a/gralloc/gralloc_priv.h
+++ b/gralloc/gralloc_priv.h
@@ -170,6 +170,8 @@ struct private_handle_t
union {
int format;
int req_format; /* same name as gralloc960 */
+ /*unused but referenced in drm_hwc */
+ int internal_format;
};
int stride;
union