diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 19:09:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 19:09:29 -0400 |
| commit | 5c65e7be4cbb015e39759275746f31bb6fa74f77 (patch) | |
| tree | c433c3d1afed1a7bbf5531a052f9202804198c1d | |
| parent | 5fc835284d45a10a181b5c3f149a701e0391d1b2 (diff) | |
| parent | e24ff467e12e1560de753313976c46e84fa6306a (diff) | |
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
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 |
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, | |||
| 4732 | return 0; | 4732 | return 0; |
| 4733 | 4733 | ||
| 4734 | if (edid) | 4734 | if (edid) |
| 4735 | size = EDID_LENGTH + (1 + edid->extensions); | 4735 | size = EDID_LENGTH * (1 + edid->extensions); |
| 4736 | 4736 | ||
| 4737 | ret = drm_property_replace_global_blob(dev, | 4737 | ret = drm_property_replace_global_blob(dev, |
| 4738 | &connector->edid_blob_ptr, | 4738 | &connector->edid_blob_ptr, |