From: Lyude Paul <lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Jerry Zuo <Jerry.Zuo-5C7GfCeVMHo@public.gmane.org>,
Daniel Vetter <daniel-/w4YWyX8dFk@public.gmane.org>,
David Airlie <airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org>,
Juston Li <juston.li-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: [PATCH v4 04/16] drm/dp_mst: Stop releasing VCPI when removing ports from topology
Date: Fri, 4 Jan 2019 19:14:54 -0500 [thread overview]
Message-ID: <20190105001506.30181-5-lyude@redhat.com> (raw)
In-Reply-To: <20190105001506.30181-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
This has never actually worked, and isn't needed anyway: the driver's
always going to try to deallocate VCPI when it tears down the display
that the VCPI belongs to.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@redhat.com>
Cc: Jerry Zuo <Jerry.Zuo@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Juston Li <juston.li@intel.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index b8a47c795fa9..f10a7edb401e 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1176,8 +1176,6 @@ static void drm_dp_destroy_port(struct kref *kref)
struct drm_dp_mst_topology_mgr *mgr = port->mgr;
if (!port->input) {
- port->vcpi.num_slots = 0;
-
kfree(port->cached_edid);
/*
@@ -3493,12 +3491,6 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
drm_dp_port_teardown_pdt(port, port->pdt);
port->pdt = DP_PEER_DEVICE_NONE;
- if (!port->input && port->vcpi.vcpi > 0) {
- drm_dp_mst_reset_vcpi_slots(mgr, port);
- drm_dp_update_payload_part1(mgr);
- drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
- }
-
drm_dp_mst_put_port_malloc(port);
send_hotplug = true;
}
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2019-01-05 0:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-05 0:14 [PATCH v4 00/16] MST refcounting/atomic helpers cleanup Lyude Paul
2019-01-05 0:14 ` [PATCH v4 01/16] drm/dp_mst: Rename drm_dp_mst_get_validated_(port|mstb)_ref and friends Lyude Paul
[not found] ` <20190105001506.30181-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-05 0:14 ` [PATCH v4 02/16] drm/dp_mst: Introduce new refcounting scheme for mstbs and ports Lyude Paul
2019-01-08 19:00 ` Wentland, Harry
2019-01-05 0:14 ` [PATCH v4 03/16] drm/dp_mst: Restart last_connected_port_and_mstb() if topology ref fails Lyude Paul
2019-01-05 0:14 ` Lyude Paul [this message]
2019-01-05 0:14 ` [PATCH v4 05/16] drm/dp_mst: Fix payload deallocation on hotplugs using malloc refs Lyude Paul
2019-01-05 0:14 ` [PATCH v4 06/16] drm/i915: Keep malloc references to MST ports Lyude Paul
2019-01-05 0:14 ` [PATCH v4 07/16] drm/amdgpu/display: Keep malloc ref to MST port Lyude Paul
2019-01-05 0:14 ` [PATCH v4 08/16] drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector() Lyude Paul
2019-01-05 0:14 ` [PATCH v4 09/16] drm/nouveau: Remove unnecessary VCPI checks in nv50_msto_cleanup() Lyude Paul
2019-01-05 0:15 ` [PATCH v4 12/16] drm/nouveau: Grab payload lock in nv50_msto_payload() Lyude Paul
2019-01-05 0:15 ` [PATCH v4 14/16] drm/dp_mst: Start tracking per-port VCPI allocations Lyude Paul
2019-01-05 0:15 ` [PATCH v4 15/16] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check() Lyude Paul
2019-01-08 19:57 ` [PATCH v4 00/16] MST refcounting/atomic helpers cleanup Wentland, Harry
[not found] ` <a297d81b-f4e2-84ea-1c06-cf38d336ac6c-5C7GfCeVMHo@public.gmane.org>
2019-01-08 21:04 ` Lyude Paul
2019-01-05 0:15 ` [PATCH v4 10/16] drm/nouveau: Keep malloc references to MST ports Lyude Paul
2019-01-05 0:15 ` [PATCH v4 11/16] drm/nouveau: Stop unsetting mstc->port, use malloc refs Lyude Paul
2019-01-05 0:15 ` [PATCH v4 13/16] drm/dp_mst: Add some atomic state iterator macros Lyude Paul
2019-01-05 0:15 ` [PATCH v4 16/16] drm/nouveau: Use atomic VCPI helpers for MST Lyude Paul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190105001506.30181-5-lyude@redhat.com \
--to=lyude-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=Jerry.Zuo-5C7GfCeVMHo@public.gmane.org \
--cc=airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=daniel-/w4YWyX8dFk@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=harry.wentland-5C7GfCeVMHo@public.gmane.org \
--cc=intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=juston.li-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox