Skip to content

Commit

Permalink
drm/amd/display: Check dc_sink every time in MST hotplug
Browse files Browse the repository at this point in the history
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>
Cc: stable@vger.kernel.org
  • Loading branch information
Jerry (Fangzhi) Zuo authored and Alex Deucher committed Apr 25, 2018
1 parent d973f85 commit 7ad3572
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,6 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)

if (!aconnector->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);

if (!edid) {
Expand All @@ -240,19 +236,25 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
}

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(
aconnector->dc_link,
(uint8_t *)edid,
(edid->extensions + 1) * EDID_LENGTH,
(uint8_t *)aconnector->edid,
(aconnector->edid->extensions + 1) * EDID_LENGTH,
&init_params);

dc_sink->priv = aconnector;
aconnector->dc_sink = dc_sink;

if (aconnector->dc_sink)
amdgpu_dm_add_sink_to_freesync_module(
connector, edid);
connector, aconnector->edid);
}

drm_mode_connector_update_edid_property(
Expand Down

0 comments on commit 7ad3572

Please sign in to comment.