p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/amd/display: Check dc_sink every time in MST hotplug 

Extended fix to: "Don't read EDID in atomic_check"

Fix issue of missing dc_sink in .mode_valid in hot plug routine.

Need to check dc_sink everytime in .get_modes hook after checking
edid, since edid is not getting removed in hot unplug but dc_sink
doesn't.

Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Jerry (Fangzhi) Zuo 2018-05-09 14:15:16 -05:00 committed by Alex Deucher
parent 6b62218123
commit 70ee2def89
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
View File

@ -226,10 +226,6 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
if (!aconnector->edid) { if (!aconnector->edid) {
struct edid *edid; struct edid *edid;
struct dc_sink *dc_sink;
struct dc_sink_init_data init_params = {
.link = aconnector->dc_link,
.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port); edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
if (!edid) { if (!edid) {
@ -240,11 +236,17 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
} }
aconnector->edid = edid; aconnector->edid = edid;
}
if (!aconnector->dc_sink) {
struct dc_sink *dc_sink;
struct dc_sink_init_data init_params = {
.link = aconnector->dc_link,
.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
dc_sink = dc_link_add_remote_sink( dc_sink = dc_link_add_remote_sink(
aconnector->dc_link, aconnector->dc_link,
(uint8_t *)edid, (uint8_t *)aconnector->edid,
(edid->extensions + 1) * EDID_LENGTH, (aconnector->edid->extensions + 1) * EDID_LENGTH,
&init_params); &init_params);
dc_sink->priv = aconnector; dc_sink->priv = aconnector;
@ -252,7 +254,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
if (aconnector->dc_sink) if (aconnector->dc_sink)
amdgpu_dm_add_sink_to_freesync_module( amdgpu_dm_add_sink_to_freesync_module(
connector, edid); connector, aconnector->edid);
} }
drm_mode_connector_update_edid_property( drm_mode_connector_update_edid_property(