From 5641642a207fdd21175d2134316c4da34db3e9e9 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Tue, 25 Feb 2014 13:50:34 +0530 Subject: gralloc: let target configure page flipping ioctl Let vendor choose which framebuffer ioctl (FBIOPUT_VSCREENINFO or FBIOPAN_DISPLAY) is best suited to do page-flip on its target platform. Neither API is well documented about their usage and most of the time it really depends on the respective framebuffer driver implementation. * Default ioctl to do page-flip is FBIOPUT_VSCREENINFO. * Set "TARGET_USE_PAN_DISPLAY=true" in board config file to use FBIOPAN_DISPLAY. Change-Id: Ic3a50bd0f5fe37ac0149e11649c4abdadea85529 Signed-off-by: Amit Pundir --- modules/gralloc/Android.mk | 3 +++ modules/gralloc/framebuffer.cpp | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'modules/gralloc') diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk index a4ffd20..092e851 100644 --- a/modules/gralloc/Android.mk +++ b/modules/gralloc/Android.mk @@ -29,5 +29,8 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := gralloc.default LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers +ifeq ($(TARGET_USE_PAN_DISPLAY),true) +LOCAL_CFLAGS += -DUSE_PAN_DISPLAY=1 +endif include $(BUILD_SHARED_LIBRARY) diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp index 9d8513a..486e27a 100644 --- a/modules/gralloc/framebuffer.cpp +++ b/modules/gralloc/framebuffer.cpp @@ -42,6 +42,13 @@ /*****************************************************************************/ +// Set TARGET_USE_PAN_DISPLAY to true at compile time if the +// board uses FBIOPAN_DISPLAY to setup page flipping, otherwise +// default ioctl to do page-flipping is FBIOPUT_VSCREENINFO. +#ifndef USE_PAN_DISPLAY +#define USE_PAN_DISPLAY 0 +#endif + // numbers of buffers for page flipping #define NUM_BUFFERS 2 @@ -178,10 +185,15 @@ int mapFrameBufferLocked(struct private_module_t* module) uint32_t flags = PAGE_FLIP; +#if USE_PAN_DISPLAY + if (ioctl(fd, FBIOPAN_DISPLAY, &info) == -1) { + ALOGW("FBIOPAN_DISPLAY failed, page flipping not supported"); +#else if (ioctl(fd, FBIOPUT_VSCREENINFO, &info) == -1) { + ALOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported"); +#endif info.yres_virtual = info.yres; flags &= ~PAGE_FLIP; - ALOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported"); } if (info.yres_virtual < info.yres * 2) { -- cgit v1.1