summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2013-09-27 12:11:48 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-01 07:45:44 +0200
commitf7e121b76469624459152542c1b809a1ebc835fe (patch)
tree295475386ab301b48c0010d1f3d3eb84baeffb7b /include
parente454a05da623c26544721b159caaacdb6dfe448c (diff)
downloadlinux-stable-f7e121b76469624459152542c1b809a1ebc835fe.tar.gz
linux-stable-f7e121b76469624459152542c1b809a1ebc835fe.tar.bz2
linux-stable-f7e121b76469624459152542c1b809a1ebc835fe.zip
drm: Code stereo layouts as an enum rather than a bit field
This allows us to use fewer bits in the mode structure, leaving room for future work while allowing more stereo layouts types than we could have ever dreamt of. I also exposed the previously private DRM_MODE_FLAG_3D_MASK to set in stone that we are using 5 bits for the stereo layout enum, reserving 32 values. Even with that reservation, we gain 3 bits from the previous encoding. The code adding the mandatory stereo modes needeed to be adapted as it was relying or being able to or stereo layouts together. Suggested-by: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_crtc.h9
-rw-r--r--include/uapi/drm/drm_mode.h19
2 files changed, 11 insertions, 17 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index b2d08ca68ee7..eb6b8dc971d9 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -181,15 +181,6 @@ struct drm_display_mode {
int hsync; /* in kHz */
};
-#define DRM_MODE_FLAG_3D_MASK (DRM_MODE_FLAG_3D_FRAME_PACKING | \
- DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE | \
- DRM_MODE_FLAG_3D_LINE_ALTERNATIVE | \
- DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL | \
- DRM_MODE_FLAG_3D_L_DEPTH | \
- DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH | \
- DRM_MODE_FLAG_3D_TOP_AND_BOTTOM | \
- DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF)
-
static inline bool drm_mode_is_stereo(const struct drm_display_mode *mode)
{
return mode->flags & DRM_MODE_FLAG_3D_MASK;
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index bafe61252754..7980f8994070 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -58,14 +58,17 @@
#define DRM_MODE_FLAG_PIXMUX (1<<11)
#define DRM_MODE_FLAG_DBLCLK (1<<12)
#define DRM_MODE_FLAG_CLKDIV2 (1<<13)
-#define DRM_MODE_FLAG_3D_FRAME_PACKING (1<<14)
-#define DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE (1<<15)
-#define DRM_MODE_FLAG_3D_LINE_ALTERNATIVE (1<<16)
-#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL (1<<17)
-#define DRM_MODE_FLAG_3D_L_DEPTH (1<<18)
-#define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH (1<<19)
-#define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (1<<20)
-#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (1<<21)
+#define DRM_MODE_FLAG_3D_MASK (0x1f<<14)
+#define DRM_MODE_FLAG_3D_NONE (0<<14)
+#define DRM_MODE_FLAG_3D_FRAME_PACKING (1<<14)
+#define DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE (2<<14)
+#define DRM_MODE_FLAG_3D_LINE_ALTERNATIVE (3<<14)
+#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL (4<<14)
+#define DRM_MODE_FLAG_3D_L_DEPTH (5<<14)
+#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)
+
/* DPMS flags */
/* bit compatible with the xorg definitions. */