Revert "drm: Add aspect ratio parsing in DRM layer" (83113df5) · Commits · 戴 / test

This reverts commit . 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). This also broke things so that we would always send out VIC==0 in the AVI infoframe unless the user specified an aspect ratio via the mode flags. And the automagic RGB full vs. limited range handling was similartly broken as the user mode would never match any CEA mode. 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:

Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by:

Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1478176304-6743-2-git-send-email-ville.syrjala@linux.intel.com

drivers/gpu/drm/drm_modes.c

+0 −31

Original line number	Diff line number	Diff line
		@@ -995,7 +995,6 @@ bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1,
		mode1->vsync_end == mode2->vsync_end &&
		mode1->vtotal == mode2->vtotal &&
		mode1->vscan == mode2->vscan &&
		mode1->picture_aspect_ratio == mode2->picture_aspect_ratio &&
		(mode1->flags & ~DRM_MODE_FLAG_3D_MASK) ==
		(mode2->flags & ~DRM_MODE_FLAG_3D_MASK))
		return true;
		@@ -1498,21 +1497,6 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out,
		out->vrefresh = in->vrefresh;
		out->flags = in->flags;
		out->type = in->type;
		out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK;

		switch (in->picture_aspect_ratio) {
		case HDMI_PICTURE_ASPECT_4_3:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_4_3;
		break;
		case HDMI_PICTURE_ASPECT_16_9:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_16_9;
		break;
		case HDMI_PICTURE_ASPECT_RESERVED:
		default:
		out->flags \|= DRM_MODE_FLAG_PIC_AR_NONE;
		break;
		}

		strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
		out->name[DRM_DISPLAY_MODE_LEN-1] = 0;
		}
		@@ -1558,21 +1542,6 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
		strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
		out->name[DRM_DISPLAY_MODE_LEN-1] = 0;

		/* Clearing picture aspect ratio bits from out flags */
		out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK;

		switch (in->flags & DRM_MODE_FLAG_PIC_AR_MASK) {
		case DRM_MODE_FLAG_PIC_AR_4_3:
		out->picture_aspect_ratio \|= HDMI_PICTURE_ASPECT_4_3;
		break;
		case DRM_MODE_FLAG_PIC_AR_16_9:
		out->picture_aspect_ratio \|= HDMI_PICTURE_ASPECT_16_9;
		break;
		default:
		out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
		break;
		}

		out->status = drm_mode_validate_basic(out);
		if (out->status != MODE_OK)
		goto out;

Admin message