| Message ID | 1617929840-13269-1-git-send-email-wangyingjie55@126.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] drm/amd/dc: Fix a missing check bug in dm_dp_mst_detect() | expand |
Applied. Thanks! Alex On Thu, Apr 8, 2021 at 9:01 PM <wangyingjie55@126.com> wrote: > > From: Yingjie Wang <wangyingjie55@126.com> > > 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> > --- > 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 8ab0b9060d2b..103dfd0e9b65 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 > @@ -271,6 +271,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.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
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 8ab0b9060d2b..103dfd0e9b65 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 @@ -271,6 +271,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); }