From: Lyude Paul <lyude@redhat.com>
To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Jerry Zuo <Jerry.Zuo@amd.com>, David Airlie <airlied@redhat.com>,
Juston Li <juston.li@intel.com>
Subject: [PATCH v6 08/20] drm/dp_mst: Stop releasing VCPI when removing ports from topology
Date: Thu, 10 Jan 2019 14:57:42 -0500 [thread overview]
Message-ID: <20190110195753.6234-9-lyude@redhat.com> (raw)
In-Reply-To: <20190110195753.6234-1-lyude@redhat.com>
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>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@redhat.com>
Cc: Jerry Zuo <Jerry.Zuo@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 7a251905b3c4..bb9107852fed 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1177,8 +1177,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);
/*
@@ -3487,12 +3485,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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-01-10 19:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 19:57 [PATCH v6 00/20] MST refcounting/atomic helpers cleanup Lyude Paul
2019-01-10 19:57 ` [PATCH v6 03/20] drm/dp_mst: Fix some formatting in drm_dp_mst_allocate_vcpi() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 04/20] drm/dp_mst: Fix some formatting in drm_dp_mst_deallocate_vcpi() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 05/20] drm/dp_mst: Rename drm_dp_mst_get_validated_(port|mstb)_ref and friends Lyude Paul
2019-01-10 19:57 ` Lyude Paul [this message]
2019-01-10 19:57 ` [PATCH v6 13/20] drm/nouveau: Remove unnecessary VCPI checks in nv50_msto_cleanup() Lyude Paul
[not found] ` <20190110195753.6234-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-10 19:57 ` [PATCH v6 01/20] drm/dp_mst: Fix some formatting in drm_dp_add_port() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 02/20] drm/dp_mst: Fix some formatting in drm_dp_payload_send_msg() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 06/20] drm/dp_mst: Introduce new refcounting scheme for mstbs and ports Lyude Paul
2019-01-10 19:57 ` [PATCH v6 07/20] drm/dp_mst: Restart last_connected_port_and_mstb() if topology ref fails Lyude Paul
2019-01-10 19:57 ` [PATCH v6 09/20] drm/dp_mst: Fix payload deallocation on hotplugs using malloc refs Lyude Paul
2019-01-10 19:57 ` [PATCH v6 10/20] drm/i915: Keep malloc references to MST ports Lyude Paul
2019-01-10 19:57 ` [PATCH v6 11/20] drm/amdgpu/display: Keep malloc ref to MST port Lyude Paul
2019-01-10 19:57 ` [PATCH v6 12/20] drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 14/20] drm/nouveau: Keep malloc references to MST ports Lyude Paul
2019-01-10 19:57 ` [PATCH v6 15/20] drm/nouveau: Stop unsetting mstc->port, use malloc refs Lyude Paul
2019-01-10 19:57 ` [PATCH v6 16/20] drm/nouveau: Grab payload lock in nv50_msto_payload() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 17/20] drm/dp_mst: Add some atomic state iterator macros Lyude Paul
2019-01-10 19:57 ` [PATCH v6 18/20] drm/dp_mst: Start tracking per-port VCPI allocations Lyude Paul
2019-01-10 19:57 ` [PATCH v6 19/20] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check() Lyude Paul
2019-01-10 19:57 ` [PATCH v6 20/20] drm/nouveau: Use atomic VCPI helpers for MST Lyude Paul
2019-01-11 0:43 ` [Nouveau] [PATCH v6 00/20] MST refcounting/atomic helpers cleanup Ben Skeggs
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=20190110195753.6234-9-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=Jerry.Zuo@amd.com \
--cc=airlied@redhat.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=juston.li@intel.com \
--cc=nouveau@lists.freedesktop.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