From: Daniel Vetter <daniel-/w4YWyX8dFk@public.gmane.org>
To: Lyude Paul <lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
Jerry Zuo <Jerry.Zuo-5C7GfCeVMHo@public.gmane.org>,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@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: Re: [PATCH v5 19/20] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check()
Date: Thu, 10 Jan 2019 10:35:59 +0100 [thread overview]
Message-ID: <20190110093559.GI21184@phenom.ffwll.local> (raw)
In-Reply-To: <20190109003516.14752-20-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
On Tue, Jan 08, 2019 at 07:35:16PM -0500, Lyude Paul wrote:
> It occurred to me that we never actually check this! So let's start
> doing that.
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> Reviewed-by: Daniel Vetter <daniel.vetter@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>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/drm_dp_mst_topology.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index fc778c6d487e..41cf814207bf 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -3650,7 +3650,7 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,
> struct drm_dp_mst_topology_state *mst_state)
> {
> struct drm_dp_vcpi_allocation *vcpi;
> - int avail_slots = 63;
> + int avail_slots = 63, payload_count = 0;
>
> list_for_each_entry(vcpi, &mst_state->vcpis, next) {
> /* Releasing VCPI is always OK-even if the port is gone */
> @@ -3670,6 +3670,12 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,
> avail_slots + vcpi->vcpi);
> return -ENOSPC;
> }
> +
> + if (++payload_count > mgr->max_payloads) {
> + DRM_DEBUG_ATOMIC("[MST MGR:%p] state %p has too many payloads (max=%d)\n",
> + mgr, mst_state, mgr->max_payloads);
> + return -EINVAL;
> + }
> }
> DRM_DEBUG_ATOMIC("[MST MGR:%p] mst state %p VCPI avail=%d used=%d\n",
> mgr, mst_state, avail_slots,
> --
> 2.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
next prev parent reply other threads:[~2019-01-10 9:35 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 0:34 [PATCH v5 00/20] MST refcounting/atomic helpers cleanup Lyude Paul
[not found] ` <20190109003516.14752-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-09 0:34 ` [PATCH v5 01/20] drm/dp_mst: Fix some formatting in drm_dp_add_port() Lyude Paul
2019-01-09 0:34 ` [PATCH v5 02/20] drm/dp_mst: Fix some formatting in drm_dp_payload_send_msg() Lyude Paul
2019-01-09 0:35 ` [PATCH v5 03/20] drm/dp_mst: Fix some formatting in drm_dp_mst_allocate_vcpi() Lyude Paul
2019-01-09 0:35 ` [PATCH v5 04/20] drm/dp_mst: Fix some formatting in drm_dp_mst_deallocate_vcpi() Lyude Paul
[not found] ` <20190109003516.14752-5-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-10 9:16 ` Daniel Vetter
2019-01-09 0:35 ` [PATCH v5 05/20] drm/dp_mst: Rename drm_dp_mst_get_validated_(port|mstb)_ref and friends Lyude Paul
2019-01-09 0:35 ` [PATCH v5 06/20] drm/dp_mst: Introduce new refcounting scheme for mstbs and ports Lyude Paul
[not found] ` <20190109003516.14752-7-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-10 9:12 ` Daniel Vetter
2019-01-09 0:35 ` [PATCH v5 07/20] drm/dp_mst: Restart last_connected_port_and_mstb() if topology ref fails Lyude Paul
[not found] ` <20190109003516.14752-8-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-10 9:16 ` Daniel Vetter
2019-01-09 0:35 ` [PATCH v5 08/20] drm/dp_mst: Stop releasing VCPI when removing ports from topology Lyude Paul
2019-01-10 9:17 ` Daniel Vetter
2019-01-09 0:35 ` [PATCH v5 09/20] drm/dp_mst: Fix payload deallocation on hotplugs using malloc refs Lyude Paul
2019-01-09 0:35 ` [PATCH v5 10/20] drm/i915: Keep malloc references to MST ports Lyude Paul
2019-01-09 0:35 ` [PATCH v5 12/20] drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector() Lyude Paul
2019-01-09 0:35 ` [PATCH v5 13/20] drm/nouveau: Remove unnecessary VCPI checks in nv50_msto_cleanup() Lyude Paul
2019-01-09 0:35 ` [PATCH v5 14/20] drm/nouveau: Keep malloc references to MST ports Lyude Paul
2019-01-09 0:35 ` [PATCH v5 15/20] drm/nouveau: Stop unsetting mstc->port, use malloc refs Lyude Paul
2019-01-09 0:35 ` [PATCH v5 16/20] drm/nouveau: Grab payload lock in nv50_msto_payload() Lyude Paul
2019-01-09 0:35 ` [PATCH v5 17/20] drm/dp_mst: Add some atomic state iterator macros Lyude Paul
2019-01-10 9:28 ` Daniel Vetter
2019-01-09 0:35 ` [PATCH v5 18/20] drm/dp_mst: Start tracking per-port VCPI allocations Lyude Paul
[not found] ` <20190109003516.14752-19-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-10 9:35 ` Daniel Vetter
2019-01-09 0:35 ` [PATCH v5 19/20] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check() Lyude Paul
[not found] ` <20190109003516.14752-20-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-10 9:35 ` Daniel Vetter [this message]
2019-01-09 0:35 ` [PATCH v5 20/20] drm/nouveau: Use atomic VCPI helpers for MST Lyude Paul
2019-01-09 0:35 ` [PATCH v5 11/20] drm/amdgpu/display: Keep malloc ref to MST port Lyude Paul
2019-01-09 0:54 ` ✗ Fi.CI.CHECKPATCH: warning for MST refcounting/atomic helpers cleanup (rev5) Patchwork
2019-01-09 1:15 ` ✓ Fi.CI.BAT: success " Patchwork
2019-01-09 10:45 ` ✓ Fi.CI.IGT: " Patchwork
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=20190110093559.GI21184@phenom.ffwll.local \
--to=daniel-/w4ywyx8dfk@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=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=lyude-H+wXaHxf7aLQT0dZR+AlfA@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