Commit e24ff467 authored Jul 03, 2015 by Shixin Zeng Committed by Daniel Vetter Jul 04, 2015

drm/crtc: Fix edid length computation



The length of each EDID block is EDID_LENGTH, and number of blocks is
(1 + edid->extensions) - we need to multiply not add them.

This causes wrong EDID to be passed on, and is a regression introduced
by d2ed3436 (drm: Introduce helper for replacing blob properties)

Signed-off-by: Shixin Zeng <zeng.shixin@gmail.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
[danvet: Add Cc: and fix commit summary.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 8b72ce15

drivers/gpu/drm/drm_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4732,7 +4732,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
		return 0;

		if (edid)
		size = EDID_LENGTH + (1 + edid->extensions);
		size = EDID_LENGTH * (1 + edid->extensions);

		ret = drm_property_replace_global_blob(dev,
		&connector->edid_blob_ptr,