move drm_module_t to a hal private header

this way it can be accessed by hwcomposer module, which will
be required to implement jellybean mr1 hooks.

Change-Id: I68872243c30aee2d0eb76f38fe54efdea4862a66
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>

diff --git a/Android.mk b/Android.mk
index 1b598aa..6acf057 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -151,6 +151,10 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        gralloc.c \
 
+LOCAL_C_INCLUDES := \
+       external/drm \
+       external/drm/include/drm \
+
 LOCAL_SHARED_LIBRARIES := \
        libgralloc_drm \
        liblog \

diff --git a/gralloc.c b/gralloc.c
index e54aca6..44dc248 100644 (file)
--- a/gralloc.c
+++ b/gralloc.c
@@ -30,13 +30,7 @@
 #include <errno.h>
 
 #include "gralloc_drm.h"
-
-struct drm_module_t {
-       gralloc_module_t base;
-
-       pthread_mutex_t mutex;
-       struct gralloc_drm_t *drm;
-};
+#include "gralloc_drm_priv.h"
 
 /*
  * Initialize the DRM device object, optionally with KMS.

diff --git a/gralloc_drm_priv.h b/gralloc_drm_priv.h
index eb2450d..66c6dbd 100644 (file)
--- a/gralloc_drm_priv.h
+++ b/gralloc_drm_priv.h
@@ -96,6 +96,13 @@ struct gralloc_drm_t {
        struct gralloc_drm_plane_t *planes;
 };
 
+struct drm_module_t {
+       gralloc_module_t base;
+
+       pthread_mutex_t mutex;
+       struct gralloc_drm_t *drm;
+};
+
 struct gralloc_drm_drv_t {
        /* destroy the driver */
        void (*destroy)(struct gralloc_drm_drv_t *drv);