Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-12-03 15:08:46 +0100
committerTakashi Iwai <tiwai@suse.de>2018-12-03 16:04:54 +0100
commite6fe15521b422fe67cbfe9280501fcead8c4c2e2 (patch)
treef2a9be0269fa9cc1840d1baed021e9e377194739
parentfbd3ec5897705f55cc88cd24140c6360d451cda0 (diff)
Delete patches.drm/drm-dp_mst-Skip-validating-ports-during-destruction-.patch (bsc#1051510)
The commit was reverted in the upstream. Put both in the blacklist now. suse-commit: 9ee57e708673b3844a5845d7d1c940f7d0014ebe
-rw-r--r--drivers/gpu/drm/drm_dp_mst_topology.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 2d5cec1ba148..719a837ea7c3 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1022,20 +1022,9 @@ static struct drm_dp_mst_port *drm_dp_mst_get_port_ref_locked(struct drm_dp_mst_
static struct drm_dp_mst_port *drm_dp_get_validated_port_ref(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
{
struct drm_dp_mst_port *rport = NULL;
-
mutex_lock(&mgr->lock);
- /*
- * Port may or may not be 'valid' but we don't care about that when
- * destroying the port and we are guaranteed that the port pointer
- * will be valid until we've finished
- */
- if (current_work() == &mgr->destroy_connector_work) {
- kref_get(&port->kref);
- rport = port;
- } else if (mgr->mst_primary) {
- rport = drm_dp_mst_get_port_ref_locked(mgr->mst_primary,
- port);
- }
+ if (mgr->mst_primary)
+ rport = drm_dp_mst_get_port_ref_locked(mgr->mst_primary, port);
mutex_unlock(&mgr->lock);
return rport;
}