Commit 20543be9 authored by Claudio Suarez's avatar Claudio Suarez Committed by Alex Deucher
Browse files

drm/amdgpu: update drm_display_info correctly when the edid is read 



drm_display_info is updated by drm_get_edid() or
drm_connector_update_edid_property(). In the amdgpu driver it is almost
always updated when the edid is read in amdgpu_connector_get_edid(),
but not always.  Change amdgpu_connector_get_edid() and
amdgpu_connector_free_edid() to keep drm_display_info updated.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarClaudio Suarez <cssk@net-c.es>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d374d3b4

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+4 −1
Original line number Diff line number Diff line
@@ -315,8 +315,10 @@ static void amdgpu_connector_get_edid(struct drm_connector *connector) 
	if (!amdgpu_connector->edid) {

		/* some laptops provide a hardcoded edid in rom for LCDs */

		if (((connector->connector_type == DRM_MODE_CONNECTOR_LVDS) ||

		     (connector->connector_type == DRM_MODE_CONNECTOR_eDP)))

		     (connector->connector_type == DRM_MODE_CONNECTOR_eDP))) {

			amdgpu_connector->edid = amdgpu_connector_get_hardcoded_edid(adev);

			drm_connector_update_edid_property(connector, amdgpu_connector->edid);

		}

	}

}
@@ -326,6 +328,7 @@ static void amdgpu_connector_free_edid(struct drm_connector *connector) 


	kfree(amdgpu_connector->edid);

	amdgpu_connector->edid = NULL;

	drm_connector_update_edid_property(connector, NULL);

}



static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −2
Original line number Diff line number Diff line
@@ -2950,13 +2950,12 @@ void amdgpu_dm_update_connector_after_detect( 
			aconnector->edid =

				(struct edid *)sink->dc_edid.raw_edid;



			drm_connector_update_edid_property(connector,

							   aconnector->edid);

			if (aconnector->dc_link->aux_mode)

				drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux,

						    aconnector->edid);

		}



		drm_connector_update_edid_property(connector, aconnector->edid);

		amdgpu_dm_update_freesync_caps(connector, aconnector->edid);

		update_connector_ext_caps(aconnector);

	} else {