diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-11-18 13:05:17 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-11-18 13:05:17 +0100 |
| commit | 3df6a76d76512f4022bacdc3a7e8f6b0bd60601f (patch) | |
| tree | bf2cecb3cec14a97d5bb6bad597eb699470d1527 | |
| parent | 416a93f4ef855a67960ddd7d7b28d0d74a50c9e3 (diff) | |
| download | drm_gralloc-3df6a76d76512f4022bacdc3a7e8f6b0bd60601f.tar.gz | |
Make it build inside Marshmallow
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | README.linaro | 5 | ||||
| -rw-r--r-- | gralloc.c | 8 | ||||
| -rw-r--r-- | gralloc_drm.h | 1 | ||||
| -rw-r--r-- | gralloc_drm_handle.h | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/README.linaro b/README.linaro new file mode 100644 index 0000000..2f4c016 --- /dev/null +++ b/README.linaro @@ -0,0 +1,5 @@ +Upstream is the freedreno branch of +https://github.com/robclark/drm_gralloc.git + +Changes: +- Make it build inside Marshmallow @@ -34,6 +34,14 @@ static pthread_mutex_t gralloc_lock = PTHREAD_MUTEX_INITIALIZER; +enum { + GRALLOC_MODULE_PERFORM_GET_DRM_FD = 0x080000002, + GRALLOC_MODULE_PERFORM_GET_DRM_MAGIC = 0x80000003, + GRALLOC_MODULE_PERFORM_AUTH_DRM_MAGIC = 0x80000004, + GRALLOC_MODULE_PERFORM_ENTER_VT = 0x80000005, + GRALLOC_MODULE_PERFORM_LEAVE_VT = 0x80000006, +}; + /* * Initialize the DRM device object, optionally with KMS. */ diff --git a/gralloc_drm.h b/gralloc_drm.h index fd291dd..b792e74 100644 --- a/gralloc_drm.h +++ b/gralloc_drm.h @@ -26,6 +26,7 @@ #include <hardware/gralloc.h> #include <system/graphics.h> +#include "gralloc_drm_formats.h" // for HAL_PIXEL_FORMAT_DRM_NV12 #ifdef __cplusplus extern "C" { diff --git a/gralloc_drm_handle.h b/gralloc_drm_handle.h index 39fbdc2..5a2f586 100644 --- a/gralloc_drm_handle.h +++ b/gralloc_drm_handle.h @@ -26,6 +26,7 @@ #include <cutils/native_handle.h> #include <system/graphics.h> +#include <log/log.h> #ifdef __cplusplus extern "C" { |