These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / platform / coda / coda_regs.h

diff --git a/kernel/drivers/media/platform/coda/coda_regs.h b/kernel/drivers/media/platform/coda/coda_regs.h
index 7d02624..3490602 100644 (file)
--- a/kernel/drivers/media/platform/coda/coda_regs.h
+++ b/kernel/drivers/media/platform/coda/coda_regs.h
@@ -51,6 +51,7 @@
 #define                CODA7_STREAM_SEL_64BITS_ENDIAN  (1 << 1)
 #define                CODA_STREAM_ENDIAN_SELECT       (1 << 0)
 #define CODA_REG_BIT_FRAME_MEM_CTRL            0x110
+#define                CODA9_FRAME_TILED2LINEAR        (1 << 11)
 #define                CODA_FRAME_CHROMA_INTERLEAVE    (1 << 2)
 #define                CODA_IMAGE_ENDIAN_SELECT        (1 << 0)
 #define CODA_REG_BIT_BIT_STREAM_PARAM          0x114
@@ -263,6 +264,10 @@
 #define                CODADX6_PICHEIGHT_MASK                          0x3ff
 #define                CODA7_PICHEIGHT_MASK                            0xffff
 #define CODA_CMD_ENC_SEQ_SRC_F_RATE                            0x194
+#define                CODA_FRATE_RES_OFFSET                           0
+#define                CODA_FRATE_RES_MASK                             0xffff
+#define                CODA_FRATE_DIV_OFFSET                           16
+#define                CODA_FRATE_DIV_MASK                             0xffff
 #define CODA_CMD_ENC_SEQ_MP4_PARA                              0x198
 #define                CODA_MP4PARAM_VERID_OFFSET                      6
 #define                CODA_MP4PARAM_VERID_MASK                        0x01
@@ -448,7 +453,12 @@
 #define CODA9_GDI_XY2_RAS_F                    (CODA9_GDMA_BASE + 0x88c)
 
 #define CODA9_GDI_XY2_RBC_CONFIG               (CODA9_GDMA_BASE + 0x890)
+#define                CODA9_XY2RBC_SEPARATE_MAP               BIT(19)
+#define                CODA9_XY2RBC_TOP_BOT_SPLIT              BIT(18)
+#define                CODA9_XY2RBC_TILED_MAP                  BIT(17)
+#define                CODA9_XY2RBC_CA_INC_HOR                 BIT(16)
 #define CODA9_GDI_RBC2_AXI_0                   (CODA9_GDMA_BASE + 0x8a0)
 #define CODA9_GDI_RBC2_AXI_1F                  (CODA9_GDMA_BASE + 0x91c)
+#define        CODA9_GDI_TILEDBUF_BASE                 (CODA9_GDMA_BASE + 0x920)
 
 #endif