From: Zheng Yang <zhengyang@rock-chips.com>
Date: Mon, 6 Mar 2017 03:00:33 +0000 (+0800)
Subject: drm: redefine YCbCr420 flag to bits 23:24
X-Git-Tag: firefly_0821_release~403
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6623cc6b99bf94f5b8609ba3656db3e35b7a5b11;p=firefly-linux-kernel-4.4.55.git

drm: redefine YCbCr420 flag to bits 23:24

Since bits[19:22] have been used for picture aspect ratio
in upstream patch 876f43c073d79ad3f14a4cebd1aea1f39fc4daf5.
We define YCbCr420 flag to the subsequent bits.

Change-Id: I2eff8b51227fc7beb4f587e90bc070ae865ba9d4
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---

diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index ad8dcfce9872..f56d025c8f6e 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -72,12 +72,6 @@
 #define  DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH	(6<<14)
 #define  DRM_MODE_FLAG_3D_TOP_AND_BOTTOM	(7<<14)
 #define  DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF	(8<<14)
-/*
- * HDMI 2.0
- */
-#define DRM_MODE_FLAG_420_MASK			(0x03<<19)
-#define  DRM_MODE_FLAG_420			(1<<19)
-#define  DRM_MODE_FLAG_420_ONLY			(1<<20)
 
 /* Picture aspect ratio options */
 #define DRM_MODE_PICTURE_ASPECT_NONE		0
@@ -93,6 +87,13 @@
 #define  DRM_MODE_FLAG_PIC_AR_16_9 \
 			(DRM_MODE_PICTURE_ASPECT_16_9<<19)
 
+/*
+ * HDMI 2.0
+ */
+#define DRM_MODE_FLAG_420_MASK			(0x03<<23)
+#define  DRM_MODE_FLAG_420			(1<<23)
+#define  DRM_MODE_FLAG_420_ONLY			(1<<24)
+
 /* DPMS flags */
 /* bit compatible with the xorg definitions. */
 #define DRM_MODE_DPMS_ON	0