| From f45a89ffd599872617f080e0b5f7853310607912 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 8 Apr 2021 17:57:20 -0700 |
| Subject: drm/amd/dc: Fix a missing check bug in dm_dp_mst_detect() |
| |
| From: Yingjie Wang <wangyingjie55@126.com> |
| |
| [ Upstream commit 655c0ed19772d92c9665ed08bdc5202acc096dda ] |
| |
| 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: 4562236b3bc0 ("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> |
| --- |
| drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| 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 1e448f1b39a1..955a055bd980 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 |
| @@ -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); |
| } |
| -- |
| 2.30.2 |
| |