summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2013-09-25 16:45:25 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-01 07:45:29 +0200
commita3ff6d5609145b06f602a5bc8e8bdbf66b96370b (patch)
tree41ac32841301c8dad56ac426714982eb2abad380 /drivers
parent1deee8d76724b478240f1bba5affe017e4f9bfa3 (diff)
downloadblackbird-op-linux-a3ff6d5609145b06f602a5bc8e8bdbf66b96370b.tar.gz
blackbird-op-linux-a3ff6d5609145b06f602a5bc8e8bdbf66b96370b.zip
drm: Reject modes with more than 1 stereo flags set
When setting a stereo 3D mode, there can be only one bit set describing the layout of the frambuffer(s). So reject invalid modes early. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Acked-by: Dave Airlie <airlied@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_crtc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 454ac8a6381c..090415f418b8 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1319,6 +1319,10 @@ static int drm_crtc_convert_umode(struct drm_display_mode *out,
if (in->clock > INT_MAX || in->vrefresh > INT_MAX)
return -ERANGE;
+ /* At most, 1 set bit describing the 3D layout of the mode */
+ if (hweight32(in->flags & DRM_MODE_FLAG_3D_MASK) > 1)
+ return -EINVAL;
+
out->clock = in->clock;
out->hdisplay = in->hdisplay;
out->hsync_start = in->hsync_start;
OpenPOWER on IntegriCloud