From: yxj Date: Sat, 14 Jul 2012 10:56:34 +0000 (+0800) Subject: rkfb:add three buffer support for menuconfig,redefine FBIOPUT_NUM_BUFFERS 0x4625 X-Git-Tag: firefly_0821_release~9004 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b3ecdc5ac2ac7d4aa405fec6acddc9f0dc3d9dd9;p=firefly-linux-kernel-4.4.55.git rkfb:add three buffer support for menuconfig,redefine FBIOPUT_NUM_BUFFERS 0x4625 --- diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c index 31911f44708a..134035e44943 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk.c +++ b/arch/arm/mach-rk30/board-rk30-sdk.c @@ -64,7 +64,11 @@ #include "../../../drivers/staging/android/timed_gpio.h" #endif +#ifdef CONFIG_THREE_FB_BUFFER #define RK30_FB0_MEM_SIZE 12*SZ_1M +#else +#define RK30_FB0_MEM_SIZE 8*SZ_1M +#endif #ifdef CONFIG_VIDEO_RK29 /*---------------- Camera Sensor Macro Define Begin ------------------------*/ diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig index 79cbc113595c..06cd988688dc 100644 --- a/drivers/video/rockchip/Kconfig +++ b/drivers/video/rockchip/Kconfig @@ -40,5 +40,12 @@ config DUAL_DISP_IN_KERNEL default y if HDMI_RK30 help select y will implement dual screen display in kernel + +config THREE_FB_BUFFER + bool "Three fb buffer support" + depends on FB_ROCKCHIP + default y + help + select y if android support three buffer,like Jelly Bean source "drivers/video/rockchip/hdmi/Kconfig" source "drivers/video/rockchip/rga/Kconfig" diff --git a/include/linux/fb.h b/include/linux/fb.h index 97e479bdc8c5..34fcd09307e0 100755 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -27,7 +27,7 @@ #define FBIOPUT_SET_CURSOR_CMAP 0x460c #define FBIOPUT_GET_CURSOR_RESOLUTION 0x460d #define FBIOPUT_GET_CURSOR_EN 0x460e -#define FBIOPUT_NUM_BUFFERS 0x460f +#define FBIOPUT_NUM_BUFFERS 0x4625 #ifdef __KERNEL__ #define FBIO_CURSOR _IOWR('F', 0x08, struct fb_cursor_user)