aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau2014-11-15 00:02:46 -0600
committersrinivas pulukuru2015-01-30 16:04:01 -0600
commit24a14d6419f48ae06dfab5d0d9adf4b8f13a4102 (patch)
treec413d10a01c4b19c153442bfb0363c4901bf918a
parent33f1f8cf3af4ea56ab07d9be74f2056c112983e8 (diff)
downloadlibdrm-24a14d6419f48ae06dfab5d0d9adf4b8f13a4102.tar.gz
libdrm-24a14d6419f48ae06dfab5d0d9adf4b8f13a4102.tar.xz
libdrm-24a14d6419f48ae06dfab5d0d9adf4b8f13a4102.zip
drm: Synchronize the stereo 3D mode flags from the kernel headers
v2: stereo layouts are now an enum (Daniel Vetter) Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: srinivas pulukuru <srinivas.pulukuru@ti.com>
-rw-r--r--include/drm/drm_mode.h39
-rw-r--r--xf86drmMode.h38
2 files changed, 49 insertions, 28 deletions
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index d41d76bc..c1bb1a30 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -42,20 +42,31 @@
42 42
43/* Video mode flags */ 43/* Video mode flags */
44/* bit compatible with the xorg definitions. */ 44/* bit compatible with the xorg definitions. */
45#define DRM_MODE_FLAG_PHSYNC (1<<0) 45#define DRM_MODE_FLAG_PHSYNC (1<<0)
46#define DRM_MODE_FLAG_NHSYNC (1<<1) 46#define DRM_MODE_FLAG_NHSYNC (1<<1)
47#define DRM_MODE_FLAG_PVSYNC (1<<2) 47#define DRM_MODE_FLAG_PVSYNC (1<<2)
48#define DRM_MODE_FLAG_NVSYNC (1<<3) 48#define DRM_MODE_FLAG_NVSYNC (1<<3)
49#define DRM_MODE_FLAG_INTERLACE (1<<4) 49#define DRM_MODE_FLAG_INTERLACE (1<<4)
50#define DRM_MODE_FLAG_DBLSCAN (1<<5) 50#define DRM_MODE_FLAG_DBLSCAN (1<<5)
51#define DRM_MODE_FLAG_CSYNC (1<<6) 51#define DRM_MODE_FLAG_CSYNC (1<<6)
52#define DRM_MODE_FLAG_PCSYNC (1<<7) 52#define DRM_MODE_FLAG_PCSYNC (1<<7)
53#define DRM_MODE_FLAG_NCSYNC (1<<8) 53#define DRM_MODE_FLAG_NCSYNC (1<<8)
54#define DRM_MODE_FLAG_HSKEW (1<<9) /* hskew provided */ 54#define DRM_MODE_FLAG_HSKEW (1<<9) /* hskew provided */
55#define DRM_MODE_FLAG_BCAST (1<<10) 55#define DRM_MODE_FLAG_BCAST (1<<10)
56#define DRM_MODE_FLAG_PIXMUX (1<<11) 56#define DRM_MODE_FLAG_PIXMUX (1<<11)
57#define DRM_MODE_FLAG_DBLCLK (1<<12) 57#define DRM_MODE_FLAG_DBLCLK (1<<12)
58#define DRM_MODE_FLAG_CLKDIV2 (1<<13) 58#define DRM_MODE_FLAG_CLKDIV2 (1<<13)
59#define DRM_MODE_FLAG_3D_MASK (0x1f<<14)
60#define DRM_MODE_FLAG_3D_NONE (0<<14)
61#define DRM_MODE_FLAG_3D_FRAME_PACKING (1<<14)
62#define DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE (2<<14)
63#define DRM_MODE_FLAG_3D_LINE_ALTERNATIVE (3<<14)
64#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL (4<<14)
65#define DRM_MODE_FLAG_3D_L_DEPTH (5<<14)
66#define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH (6<<14)
67#define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (7<<14)
68#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (8<<14)
69
59 70
60/* DPMS flags */ 71/* DPMS flags */
61/* bit compatible with the xorg definitions. */ 72/* bit compatible with the xorg definitions. */
diff --git a/xf86drmMode.h b/xf86drmMode.h
index 5bc60ee0..7fc52b6a 100644
--- a/xf86drmMode.h
+++ b/xf86drmMode.h
@@ -81,20 +81,30 @@ extern "C" {
81 81
82/* Video mode flags */ 82/* Video mode flags */
83/* bit compatible with the xorg definitions. */ 83/* bit compatible with the xorg definitions. */
84#define DRM_MODE_FLAG_PHSYNC (1<<0) 84#define DRM_MODE_FLAG_PHSYNC (1<<0)
85#define DRM_MODE_FLAG_NHSYNC (1<<1) 85#define DRM_MODE_FLAG_NHSYNC (1<<1)
86#define DRM_MODE_FLAG_PVSYNC (1<<2) 86#define DRM_MODE_FLAG_PVSYNC (1<<2)
87#define DRM_MODE_FLAG_NVSYNC (1<<3) 87#define DRM_MODE_FLAG_NVSYNC (1<<3)
88#define DRM_MODE_FLAG_INTERLACE (1<<4) 88#define DRM_MODE_FLAG_INTERLACE (1<<4)
89#define DRM_MODE_FLAG_DBLSCAN (1<<5) 89#define DRM_MODE_FLAG_DBLSCAN (1<<5)
90#define DRM_MODE_FLAG_CSYNC (1<<6) 90#define DRM_MODE_FLAG_CSYNC (1<<6)
91#define DRM_MODE_FLAG_PCSYNC (1<<7) 91#define DRM_MODE_FLAG_PCSYNC (1<<7)
92#define DRM_MODE_FLAG_NCSYNC (1<<8) 92#define DRM_MODE_FLAG_NCSYNC (1<<8)
93#define DRM_MODE_FLAG_HSKEW (1<<9) /* hskew provided */ 93#define DRM_MODE_FLAG_HSKEW (1<<9) /* hskew provided */
94#define DRM_MODE_FLAG_BCAST (1<<10) 94#define DRM_MODE_FLAG_BCAST (1<<10)
95#define DRM_MODE_FLAG_PIXMUX (1<<11) 95#define DRM_MODE_FLAG_PIXMUX (1<<11)
96#define DRM_MODE_FLAG_DBLCLK (1<<12) 96#define DRM_MODE_FLAG_DBLCLK (1<<12)
97#define DRM_MODE_FLAG_CLKDIV2 (1<<13) 97#define DRM_MODE_FLAG_CLKDIV2 (1<<13)
98#define DRM_MODE_FLAG_3D_MASK (0x1f<<14)
99#define DRM_MODE_FLAG_3D_NONE (0<<14)
100#define DRM_MODE_FLAG_3D_FRAME_PACKING (1<<14)
101#define DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE (2<<14)
102#define DRM_MODE_FLAG_3D_LINE_ALTERNATIVE (3<<14)
103#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL (4<<14)
104#define DRM_MODE_FLAG_3D_L_DEPTH (5<<14)
105#define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH (6<<14)
106#define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (7<<14)
107#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (8<<14)
98 108
99/* DPMS flags */ 109/* DPMS flags */
100/* bit compatible with the xorg definitions. */ 110/* bit compatible with the xorg definitions. */