|
@@ -2949,6 +2949,7 @@
|
|
|
#define CURSOR_ENABLE 0x80000000
|
|
|
#define CURSOR_GAMMA_ENABLE 0x40000000
|
|
|
#define CURSOR_STRIDE_MASK 0x30000000
|
|
|
+#define CURSOR_PIPE_CSC_ENABLE (1<<24)
|
|
|
#define CURSOR_FORMAT_SHIFT 24
|
|
|
#define CURSOR_FORMAT_MASK (0x07 << CURSOR_FORMAT_SHIFT)
|
|
|
#define CURSOR_FORMAT_2C (0x00 << CURSOR_FORMAT_SHIFT)
|
|
@@ -3010,6 +3011,7 @@
|
|
|
#define DISPPLANE_RGBA888 (0xf<<26)
|
|
|
#define DISPPLANE_STEREO_ENABLE (1<<25)
|
|
|
#define DISPPLANE_STEREO_DISABLE 0
|
|
|
+#define DISPPLANE_PIPE_CSC_ENABLE (1<<24)
|
|
|
#define DISPPLANE_SEL_PIPE_SHIFT 24
|
|
|
#define DISPPLANE_SEL_PIPE_MASK (3<<DISPPLANE_SEL_PIPE_SHIFT)
|
|
|
#define DISPPLANE_SEL_PIPE_A 0
|
|
@@ -3098,6 +3100,7 @@
|
|
|
#define DVS_FORMAT_RGBX101010 (1<<25)
|
|
|
#define DVS_FORMAT_RGBX888 (2<<25)
|
|
|
#define DVS_FORMAT_RGBX161616 (3<<25)
|
|
|
+#define DVS_PIPE_CSC_ENABLE (1<<24)
|
|
|
#define DVS_SOURCE_KEY (1<<22)
|
|
|
#define DVS_RGB_ORDER_XBGR (1<<20)
|
|
|
#define DVS_YUV_BYTE_ORDER_MASK (3<<16)
|
|
@@ -3165,7 +3168,7 @@
|
|
|
#define SPRITE_FORMAT_RGBX161616 (3<<25)
|
|
|
#define SPRITE_FORMAT_YUV444 (4<<25)
|
|
|
#define SPRITE_FORMAT_XR_BGR101010 (5<<25) /* Extended range */
|
|
|
-#define SPRITE_CSC_ENABLE (1<<24)
|
|
|
+#define SPRITE_PIPE_CSC_ENABLE (1<<24)
|
|
|
#define SPRITE_SOURCE_KEY (1<<22)
|
|
|
#define SPRITE_RGB_ORDER_RGBX (1<<20) /* only for 888 and 161616 */
|
|
|
#define SPRITE_YUV_TO_RGB_CSC_DISABLE (1<<19)
|
|
@@ -4645,4 +4648,51 @@
|
|
|
#define WM_DBG_DISALLOW_MAXFIFO (1<<1)
|
|
|
#define WM_DBG_DISALLOW_SPRITE (1<<2)
|
|
|
|
|
|
+/* pipe CSC */
|
|
|
+#define _PIPE_A_CSC_COEFF_RY_GY 0x49010
|
|
|
+#define _PIPE_A_CSC_COEFF_BY 0x49014
|
|
|
+#define _PIPE_A_CSC_COEFF_RU_GU 0x49018
|
|
|
+#define _PIPE_A_CSC_COEFF_BU 0x4901c
|
|
|
+#define _PIPE_A_CSC_COEFF_RV_GV 0x49020
|
|
|
+#define _PIPE_A_CSC_COEFF_BV 0x49024
|
|
|
+#define _PIPE_A_CSC_MODE 0x49028
|
|
|
+#define _PIPE_A_CSC_PREOFF_HI 0x49030
|
|
|
+#define _PIPE_A_CSC_PREOFF_ME 0x49034
|
|
|
+#define _PIPE_A_CSC_PREOFF_LO 0x49038
|
|
|
+#define _PIPE_A_CSC_POSTOFF_HI 0x49040
|
|
|
+#define _PIPE_A_CSC_POSTOFF_ME 0x49044
|
|
|
+#define _PIPE_A_CSC_POSTOFF_LO 0x49048
|
|
|
+
|
|
|
+#define _PIPE_B_CSC_COEFF_RY_GY 0x49110
|
|
|
+#define _PIPE_B_CSC_COEFF_BY 0x49114
|
|
|
+#define _PIPE_B_CSC_COEFF_RU_GU 0x49118
|
|
|
+#define _PIPE_B_CSC_COEFF_BU 0x4911c
|
|
|
+#define _PIPE_B_CSC_COEFF_RV_GV 0x49120
|
|
|
+#define _PIPE_B_CSC_COEFF_BV 0x49124
|
|
|
+#define _PIPE_B_CSC_MODE 0x49128
|
|
|
+#define _PIPE_B_CSC_PREOFF_HI 0x49130
|
|
|
+#define _PIPE_B_CSC_PREOFF_ME 0x49134
|
|
|
+#define _PIPE_B_CSC_PREOFF_LO 0x49138
|
|
|
+#define _PIPE_B_CSC_POSTOFF_HI 0x49140
|
|
|
+#define _PIPE_B_CSC_POSTOFF_ME 0x49144
|
|
|
+#define _PIPE_B_CSC_POSTOFF_LO 0x49148
|
|
|
+
|
|
|
+#define CSC_BLACK_SCREEN_OFFSET (1 << 2)
|
|
|
+#define CSC_POSITION_BEFORE_GAMMA (1 << 1)
|
|
|
+#define CSC_MODE_YUV_TO_RGB (1 << 0)
|
|
|
+
|
|
|
+#define PIPE_CSC_COEFF_RY_GY(pipe) _PIPE(pipe, _PIPE_A_CSC_COEFF_RY_GY, _PIPE_B_CSC_COEFF_RY_GY)
|
|
|
+#define PIPE_CSC_COEFF_BY(pipe) _PIPE(pipe, _PIPE_A_CSC_COEFF_BY, _PIPE_B_CSC_COEFF_BY)
|
|
|
+#define PIPE_CSC_COEFF_RU_GU(pipe) _PIPE(pipe, _PIPE_A_CSC_COEFF_RU_GU, _PIPE_B_CSC_COEFF_RU_GU)
|
|
|
+#define PIPE_CSC_COEFF_BU(pipe) _PIPE(pipe, _PIPE_A_CSC_COEFF_BU, _PIPE_B_CSC_COEFF_BU)
|
|
|
+#define PIPE_CSC_COEFF_RV_GV(pipe) _PIPE(pipe, _PIPE_A_CSC_COEFF_RV_GV, _PIPE_B_CSC_COEFF_RV_GV)
|
|
|
+#define PIPE_CSC_COEFF_BV(pipe) _PIPE(pipe, _PIPE_A_CSC_COEFF_BV, _PIPE_B_CSC_COEFF_BV)
|
|
|
+#define PIPE_CSC_MODE(pipe) _PIPE(pipe, _PIPE_A_CSC_MODE, _PIPE_B_CSC_MODE)
|
|
|
+#define PIPE_CSC_PREOFF_HI(pipe) _PIPE(pipe, _PIPE_A_CSC_PREOFF_HI, _PIPE_B_CSC_PREOFF_HI)
|
|
|
+#define PIPE_CSC_PREOFF_ME(pipe) _PIPE(pipe, _PIPE_A_CSC_PREOFF_ME, _PIPE_B_CSC_PREOFF_ME)
|
|
|
+#define PIPE_CSC_PREOFF_LO(pipe) _PIPE(pipe, _PIPE_A_CSC_PREOFF_LO, _PIPE_B_CSC_PREOFF_LO)
|
|
|
+#define PIPE_CSC_POSTOFF_HI(pipe) _PIPE(pipe, _PIPE_A_CSC_POSTOFF_HI, _PIPE_B_CSC_POSTOFF_HI)
|
|
|
+#define PIPE_CSC_POSTOFF_ME(pipe) _PIPE(pipe, _PIPE_A_CSC_POSTOFF_ME, _PIPE_B_CSC_POSTOFF_ME)
|
|
|
+#define PIPE_CSC_POSTOFF_LO(pipe) _PIPE(pipe, _PIPE_A_CSC_POSTOFF_LO, _PIPE_B_CSC_POSTOFF_LO)
|
|
|
+
|
|
|
#endif /* _I915_REG_H_ */
|