update for new gralloc enable

Change-Id: I21222c90c8f4ebec42ba7718226b918af0e812fb
Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>

2 files changed, 11 insertions, 5 deletions

diff --git a/Android.mk b/Android.mk
index a00e16f..1fbd70a 100755
--- a/Android.mk
+++ b/Android.mk
@@ -13,14 +13,15 @@ LOCAL_SHARED_LIBRARIES := liblog libEGL libutils libcutils libhardware libsync l
 LOCAL_STATIC_LIBRARIES := libomxutil
 LOCAL_SRC_FILES := hwcomposer.cpp
 
-ifneq (,$(wildcard hardware/amlogic/gralloc))
-GRALLOC_DIR := hardware/amlogic/gralloc
-else
-GRALLOC_DIR := hardware/libhardware/modules/gralloc
+ifneq ($(MESON_GRALLOC_DIR),)
+LOCAL_CFLAGS += -DGRALLOC_T83X
+WITH_LIBPLAYER_MODULE := false
 endif
 
+MESON_GRALLOC_DIR ?= hardware/amlogic/gralloc
+
 LOCAL_C_INCLUDES += \
-    $(GRALLOC_DIR)
+    $(MESON_GRALLOC_DIR)
 
 LOCAL_C_INCLUDES += system/core/libion/include/ \
                 system/core/libion/kernel-headers
diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index d34286b..a2c3cba 100755
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -1085,8 +1085,13 @@ int init_display(hwc_context_1_t* context,int displayType)
         if (displayType > 0) usage |= GRALLOC_USAGE_EXTERNAL_DISP;
 
         //Register the framebuffer to gralloc module
+#ifndef GRALLOC_T83X
         display_ctx->fb_hnd = new private_handle_t(private_handle_t::PRIV_FLAGS_FRAMEBUFFER, usage, fbinfo->fbSize, 0,
                                                                     0, fbinfo->fd, bufferSize);
+#else
+        display_ctx->fb_hnd = new private_handle_t(private_handle_t::PRIV_FLAGS_FRAMEBUFFER, usage, fbinfo->fbSize, 0,
+                                                                    0, fbinfo->fd, bufferSize, 0);
+#endif
         context->gralloc_module->base.registerBuffer(&(context->gralloc_module->base),display_ctx->fb_hnd);
         HWC_LOGDB("init_frame_buffer get frame size %d usage %d",bufferSize,usage);
     }