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

Commit 7920232d authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

Revert "drm: Add and handle new aspect ratios in DRM layer" 



This reverts commit a68362fe.

Adding new mode flags willy nilly breaks existing userspace. We need to
coordinate this better, potentially with a new client cap that only
exposes the aspect ratio flags when userspace is prepared for them
(similar to what we do with stereo 3D modes).

Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Lin, Jia <lin.a.jia@intel.com>
Cc: Akashdeep Sharma <akashdeep.sharma@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Cc: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1478176304-6743-1-git-send-email-ville.syrjala@linux.intel.com
parent 2d5e836d

drivers/gpu/drm/drm_modes.c

+0 −12
Original line number Diff line number Diff line
@@ -1507,12 +1507,6 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, 
	case HDMI_PICTURE_ASPECT_16_9:

		out->flags |= DRM_MODE_FLAG_PIC_AR_16_9;

		break;

	case HDMI_PICTURE_ASPECT_64_27:

		out->flags |= DRM_MODE_FLAG_PIC_AR_64_27;

		break;

	case DRM_MODE_PICTURE_ASPECT_256_135:

		out->flags |= DRM_MODE_FLAG_PIC_AR_256_135;

		break;

	case HDMI_PICTURE_ASPECT_RESERVED:

	default:

		out->flags |= DRM_MODE_FLAG_PIC_AR_NONE;
@@ -1574,12 +1568,6 @@ int drm_mode_convert_umode(struct drm_display_mode *out, 
	case DRM_MODE_FLAG_PIC_AR_16_9:

		out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9;

		break;

	case DRM_MODE_FLAG_PIC_AR_64_27:

		out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27;

		break;

	case DRM_MODE_FLAG_PIC_AR_256_135:

		out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135;

		break;

	default:

		out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;

		break;

include/uapi/drm/drm_mode.h

+0 −6
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ extern "C" { 
#define DRM_MODE_PICTURE_ASPECT_NONE		0

#define DRM_MODE_PICTURE_ASPECT_4_3		1

#define DRM_MODE_PICTURE_ASPECT_16_9		2

#define DRM_MODE_PICTURE_ASPECT_64_27		3

#define DRM_MODE_PICTURE_ASPECT_256_135		4



/* Aspect ratio flag bitmask (4 bits 22:19) */

#define DRM_MODE_FLAG_PIC_AR_MASK		(0x0F<<19)
@@ -100,10 +98,6 @@ extern "C" { 
			(DRM_MODE_PICTURE_ASPECT_4_3<<19)

#define  DRM_MODE_FLAG_PIC_AR_16_9 \

			(DRM_MODE_PICTURE_ASPECT_16_9<<19)

#define  DRM_MODE_FLAG_PIC_AR_64_27 \

			(DRM_MODE_PICTURE_ASPECT_64_27<<19)

#define  DRM_MODE_FLAG_PIC_AR_256_135 \

			(DRM_MODE_PICTURE_ASPECT_256_135<<19)



/* DPMS flags */

/* bit compatible with the xorg definitions. */