Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5848ad40 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm: Reject stereo modes with an unknown layout 



The kernel shouldn't accept invalid modes, just say No.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fc4833c1

drivers/gpu/drm/drm_crtc.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1319,6 +1319,9 @@ static int drm_crtc_convert_umode(struct drm_display_mode *out, 
	if (in->clock > INT_MAX || in->vrefresh > INT_MAX)

	if (in->clock > INT_MAX || in->vrefresh > INT_MAX)

		return -ERANGE;

		return -ERANGE;





	if ((in->flags & DRM_MODE_FLAG_3D_MASK) > DRM_MODE_FLAG_3D_MAX)

		return -EINVAL;



	out->clock = in->clock;

	out->clock = in->clock;

	out->hdisplay = in->hdisplay;

	out->hdisplay = in->hdisplay;

	out->hsync_start = in->hsync_start;

	out->hsync_start = in->hsync_start;

include/drm/drm_crtc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,8 @@ enum drm_mode_status { 
#define CRTC_INTERLACE_HALVE_V	(1 << 0) /* halve V values for interlacing */

#define CRTC_INTERLACE_HALVE_V	(1 << 0) /* halve V values for interlacing */

#define CRTC_STEREO_DOUBLE	(1 << 1) /* adjust timings for stereo modes */

#define CRTC_STEREO_DOUBLE	(1 << 1) /* adjust timings for stereo modes */





#define DRM_MODE_FLAG_3D_MAX	DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF



struct drm_display_mode {

struct drm_display_mode {

	/* Header */

	/* Header */

	struct list_head head;

	struct list_head head;

include/uapi/drm/drm_mode.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,10 @@ 
#define DRM_MODE_FLAG_PIXMUX			(1<<11)

#define DRM_MODE_FLAG_PIXMUX			(1<<11)

#define DRM_MODE_FLAG_DBLCLK			(1<<12)

#define DRM_MODE_FLAG_DBLCLK			(1<<12)

#define DRM_MODE_FLAG_CLKDIV2			(1<<13)

#define DRM_MODE_FLAG_CLKDIV2			(1<<13)

 /*

  * When adding a new stereo mode don't forget to adjust DRM_MODE_FLAGS_3D_MAX

  * (define not exposed to user space).

  */

#define DRM_MODE_FLAG_3D_MASK			(0x1f<<14)

#define DRM_MODE_FLAG_3D_MASK			(0x1f<<14)

#define  DRM_MODE_FLAG_3D_NONE			(0<<14)

#define  DRM_MODE_FLAG_3D_NONE			(0<<14)

#define  DRM_MODE_FLAG_3D_FRAME_PACKING		(1<<14)

#define  DRM_MODE_FLAG_3D_FRAME_PACKING		(1<<14)