Commit 5c65e7be authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel

Pull drm EDID fix from Daniel Vetter:
 "Since Dave is enjoying vacation I figured I'll send you this drm core
  fix directly"

* tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel:
  drm/crtc: Fix edid length computation
parents 5fc83528 e24ff467
...@@ -4732,7 +4732,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, ...@@ -4732,7 +4732,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
return 0; return 0;
if (edid) if (edid)
size = EDID_LENGTH + (1 + edid->extensions); size = EDID_LENGTH * (1 + edid->extensions);
ret = drm_property_replace_global_blob(dev, ret = drm_property_replace_global_blob(dev,
&connector->edid_blob_ptr, &connector->edid_blob_ptr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment