Merge tag 'stable/for-linus-3.19-rc4-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[firefly-linux-kernel-4.4.55.git] / include / video / mmp_disp.h

diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h
index b9dd1fbb00827d29aff8b3ff5d814d85715a2245..9fd9398368d5845e9e0cf09b8e1276d84927bde3 100644 (file)
--- a/include/video/mmp_disp.h
+++ b/include/video/mmp_disp.h
@@ -91,6 +91,11 @@ struct mmp_win {
        u16     up_crop;
        u16     bottom_crop;
        int     pix_fmt;
+       /*
+        * pitch[0]: graphics/video layer line length or y pitch
+        * pitch[1]/pitch[2]: video u/v pitch if non-zero
+        */
+       u32     pitch[3];
 };
 
 struct mmp_addr {
@@ -334,6 +339,7 @@ struct mmp_mach_path_config {
        int output_type;
        u32 path_config;
        u32 link_config;
+       u32 dsi_rbswap;
 };
 
 struct mmp_mach_plat_info {