diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-03 09:27:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-03 09:27:15 +1000 |
| commit | c7d748743f3ae73f1997a0a56e34674244b99a4a (patch) | |
| tree | 8cab6ec4dc84c04c07d95b1e52ad543913e3b5ab | |
| parent | 91fd89660ba2e8ee59a587294fa9b17761691b05 (diff) | |
| parent | ad692b46dbf122ef90aadce3b389ef64c90e861d (diff) | |
| download | op-kernel-dev-c7d748743f3ae73f1997a0a56e34674244b99a4a.zip op-kernel-dev-c7d748743f3ae73f1997a0a56e34674244b99a4a.tar.gz | |
Merge tag 'topic/drm-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Here's a single drm core fix, cc: stable, that affects i915
users.
* tag 'topic/drm-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel:
drm/edid: set ELD for firmware and debugfs override EDIDs
| -rw-r--r-- | drivers/gpu/drm/drm_edid_load.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_probe_helper.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 732cb6f..4c0aa97 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -287,6 +287,7 @@ int drm_load_edid_firmware(struct drm_connector *connector) drm_mode_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); + drm_edid_to_eld(connector, edid); kfree(edid); return ret; diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 6591d48..3fee587 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -174,6 +174,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect struct edid *edid = (struct edid *) connector->edid_blob_ptr->data; count = drm_add_edid_modes(connector, edid); + drm_edid_to_eld(connector, edid); } else count = (*connector_funcs->get_modes)(connector); } |
