summaryrefslogtreecommitdiff
authorStark Li <stark.li@amlogic.com>2015-12-29 03:51:51 (GMT)
committer Stark Li <stark.li@amlogic.com>2015-12-29 03:51:51 (GMT)
commit535357dfa4b98d91ea0dba054e5159385cd3d588 (patch)
tree36a828050a2f343eb386dbc7ade52b50eb3dff54
parentde2c21e383c97d51029893eb3a7ba153e32b9674 (diff)
downloadhwcomposer-535357dfa4b98d91ea0dba054e5159385cd3d588.zip
hwcomposer-535357dfa4b98d91ea0dba054e5159385cd3d588.tar.gz
hwcomposer-535357dfa4b98d91ea0dba054e5159385cd3d588.tar.bz2
PD#117326: Have new gralloc (hardware/amlogic/gralloc/) for TV&MBOX
Change-Id: I65f21d2ed86d5265a839f617248ccaf78da8b547
Diffstat
-rwxr-xr-xAndroid.mk4
-rwxr-xr-xhwcomposer.cpp5
2 files changed, 0 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index ade350d..2093d89 100755
--- a/Android.mk
+++ b/Android.mk
@@ -13,10 +13,6 @@ LOCAL_SHARED_LIBRARIES := liblog libEGL libutils libcutils libhardware libsync l
LOCAL_STATIC_LIBRARIES := libomxutil
LOCAL_SRC_FILES := hwcomposer.cpp
-ifeq ($(GPU_TYPE),t83x)
-LOCAL_CFLAGS += -DGRALLOC_T83X
-endif
-
MESON_GRALLOC_DIR ?= hardware/amlogic/gralloc
LOCAL_C_INCLUDES += \
diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index 3552d40..4eafac2 100755
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -1035,13 +1035,8 @@ 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);
}