shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk_fb.h: remove multiple definitions

Browse Source 
Change-Id: I34b7d0a4db251521693a5d13ace0d33ccad1717e
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
This commit is contained in:
Huang Jiachai
2015-11-09 09:45:28 +08:00
parent bd6af9ff78
commit e66d1eb972
2 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/dt-bindings/rkfb/rk_fb.h
View File

@@ -12,7 +12,9 @@
#define NO_DUAL 0
#define ONE_DUAL 1
#define DUAL 2
/********************************************************************
** display output interface supported by rockchip **
********************************************************************/
#define OUT_P888 0 //24bit screen,connect to lcdc D0~D23
#define OUT_P666 1 //18bit screen,connect to lcdc D0~D17
#define OUT_P565 2
@@ -48,13 +50,17 @@
#define LVDS_10BIT_1 4
#define LVDS_10BIT_2 5
/* x y mirror or rotate mode */
#define NO_MIRROR 0
#define X_MIRROR 1
#define Y_MIRROR 2
#define X_Y_MIRROR 3
#define ROTATE_90 4
#define ROTATE_180 8
#define ROTATE_270 12
#define X_MIRROR 1 /* up-down flip*/
#define Y_MIRROR 2 /* left-right flip */
#define X_Y_MIRROR 3 /* the same as rotate 180 degrees */
#define ROTATE_90 4 /* clockwise rotate 90 degrees */
#define ROTATE_180 8 /* rotate 180 degrees
* It is recommended to use X_Y_MIRROR
* rather than ROTATE_180
*/
#define ROTATE_270 12/* clockwise rotate 270 degrees */
#define COLOR_RGB 0
#define COLOR_RGB_BT2020 1

32
include/linux/rk_fb.h
View File

@@ -80,20 +80,6 @@
#define RK_LF_STATUS_NC 0xfe
#define RK_LF_MAX_TIMEOUT (1600000UL << 6) //>0.64s
/* x y mirror or rotate mode */
#define NO_MIRROR 0
#define X_MIRROR 1 /* up-down flip*/
#define Y_MIRROR 2 /* left-right flip */
#define X_Y_MIRROR 3 /* the same as rotate 180 degrees */
#define ROTATE_90 4 /* clockwise rotate 90 degrees */
#define ROTATE_180 8 /* rotate 180 degrees
* It is recommended to use X_Y_MIRROR
* rather than ROTATE_180
*/
#define ROTATE_270 12 /* clockwise rotate 270 degrees */
/**
* pixel align value for gpu,align as 64 bytes in an odd number of times
*/
@@ -117,24 +103,6 @@ extern u64 rk_fb_get_prmry_screen_framedone_t(void);
extern int rk_fb_set_prmry_screen_status(int status);
extern bool rk_fb_poll_wait_frame_complete(void);
/********************************************************************
** display output interface supported by rockchip lcdc *
********************************************************************/
/* */
#define OUT_P888 0 //24bit screen,connect to lcdc D0~D23
#define OUT_P666 1 //18bit screen,connect to lcdc D0~D17
#define OUT_P565 2
#define OUT_S888x 4
#define OUT_CCIR656 6
#define OUT_S888 8
#define OUT_S888DUMY 12
#define OUT_YUV_420 14
#define OUT_P101010 15
#define OUT_YUV_420_10BIT 16
#define OUT_P16BPP4 24
#define OUT_D888_P666 0x21 //18bit screen,connect to lcdc D2~D7, D10~D15, D18~D23
#define OUT_D888_P565 0x22
enum {
CSC_BT601,
CSC_BT709,