Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7d74874 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 91fd8966 ad692b46

drivers/gpu/drm/drm_edid_load.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/drm_probe_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

	}