aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShixin Zeng <zeng.shixin@gmail.com>2015-07-03 08:46:50 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-07-04 00:52:34 +0200
commite24ff467e12e1560de753313976c46e84fa6306a (patch)
tree99ab42e86bc4799c527a3d962d58a29dbfd543fb
parent8b72ce158cf0dba443e36fc66e0bb29c2580e0b6 (diff)
drm/crtc: Fix edid length computationtopic/drm-fixes-2015-07-04
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 d2ed34362a52 (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>
-rw-r--r--drivers/gpu/drm/drm_crtc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index b69ed97d447c..b9ba06176eb1 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -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,

Privacy Policy