Skip to content

Commit

Permalink
drm/amd/dc: Fix a missing check bug in dm_dp_mst_detect()
Browse files Browse the repository at this point in the history
[ Upstream commit 655c0ed ]

In dm_dp_mst_detect(), We should check whether or not @connector
has been unregistered from userspace. If the connector is unregistered,
we should return disconnected status.

Fixes: 4562236 ("drm/amd/dc: Add dc display driver (v2)")
Signed-off-by: Yingjie Wang <wangyingjie55@126.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yingjie Wang authored and gregkh committed Jul 14, 2021
1 parent 0cd39c9 commit 5885fce
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 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 @@ -268,6 +268,9 @@ dm_dp_mst_detect(struct drm_connector *connector,
struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
struct amdgpu_dm_connector *master = aconnector->mst_port;

if (drm_connector_is_unregistered(connector))
return connector_status_disconnected;

return drm_dp_mst_detect_port(connector, ctx, &master->mst_mgr,
aconnector->port);
}
Expand Down

0 comments on commit 5885fce

Please sign in to comment.