diff options
author | Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com> | 2018-04-17 13:49:48 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-04-25 11:08:02 -0400 |
commit | d973f8535f033fac1599bd5eae6835e6bb304da3 (patch) | |
tree | 5f21102fe6c7d1d3f2c5c67532623934049c0087 | |
parent | c7b8de00384be49dc1617a838b0ce89a0235f319 (diff) |
drm/amd/display: Update MST edid property every time
Extended fix to: "Don't read EDID in atomic_check"
Fix display property not observed in GUI display after hot plug.
Call drm_mode_connector_update_edid_property every time in
.get_modes hook, due to the fact that edid property is getting
removed from usermode ioctl DRM_IOCTL_MODE_GETCONNECTOR each time
in hot unplug.
Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 305292a9ff80..8c1d084429dc 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | |||
@@ -253,11 +253,11 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) | |||
253 | if (aconnector->dc_sink) | 253 | if (aconnector->dc_sink) |
254 | amdgpu_dm_add_sink_to_freesync_module( | 254 | amdgpu_dm_add_sink_to_freesync_module( |
255 | connector, edid); | 255 | connector, edid); |
256 | |||
257 | drm_mode_connector_update_edid_property( | ||
258 | &aconnector->base, edid); | ||
259 | } | 256 | } |
260 | 257 | ||
258 | drm_mode_connector_update_edid_property( | ||
259 | &aconnector->base, aconnector->edid); | ||
260 | |||
261 | ret = drm_add_edid_modes(connector, aconnector->edid); | 261 | ret = drm_add_edid_modes(connector, aconnector->edid); |
262 | 262 | ||
263 | return ret; | 263 | return ret; |