Commit faacff8e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/edid: don't modify EDID while parsing 



We'll want to keep the EDID immutable while parsing. Stop modifying the
EDID because of the quirks.

In theory, this does have userspace implications, but the userspace is
supposed to use the modes exposed via KMS API, not by parsing the EDID
directly.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/45d5cf067eaad49b321ac82836090d9de524374e.1648477901.git.jani.nikula@intel.com
parent 8b917cbe

drivers/gpu/drm/drm_edid.c

+9 −9
Original line number Diff line number Diff line
@@ -2740,8 +2740,8 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, 
		return NULL;



	if (quirks & EDID_QUIRK_135_CLOCK_TOO_HIGH)

		timing->pixel_clock = cpu_to_le16(1088);



		mode->clock = 1088 * 10;

	else

		mode->clock = le16_to_cpu(timing->pixel_clock) * 10;



	mode->hdisplay = hactive;
@@ -2763,13 +2763,13 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, 
	drm_mode_do_interlace_quirk(mode, pt);



	if (quirks & EDID_QUIRK_DETAILED_SYNC_PP) {

		pt->misc |= DRM_EDID_PT_HSYNC_POSITIVE | DRM_EDID_PT_VSYNC_POSITIVE;

	}



		mode->flags |= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC;

	} else {

		mode->flags |= (pt->misc & DRM_EDID_PT_HSYNC_POSITIVE) ?

			DRM_MODE_FLAG_PHSYNC : DRM_MODE_FLAG_NHSYNC;

		mode->flags |= (pt->misc & DRM_EDID_PT_VSYNC_POSITIVE) ?

			DRM_MODE_FLAG_PVSYNC : DRM_MODE_FLAG_NVSYNC;

	}



set_size:

	mode->width_mm = pt->width_mm_lo | (pt->width_height_mm_hi & 0xf0) << 4;