From: Daniel Vetter <daniel@ffwll.ch>
To: Lyude Paul <lyude@redhat.com>
Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
Daniel Vetter <daniel@ffwll.ch>, Dave Airlie <airlied@gmail.com>,
Harry Wentland <harry.wentland@amd.com>,
Jerry Zuo <Jerry.Zuo@amd.com>, Juston Li <juston.li@intel.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>,
linux-kernel@vger.kernel.org
Subject: Re: [WIP PATCH 02/15] drm/dp_mst: Refactor drm_dp_update_payload_part1()
Date: Fri, 14 Dec 2018 09:47:43 +0100 [thread overview]
Message-ID: <20181214084743.GM21184@phenom.ffwll.local> (raw)
In-Reply-To: <20181214012604.13746-3-lyude@redhat.com>
On Thu, Dec 13, 2018 at 08:25:31PM -0500, Lyude Paul wrote:
> There should be no functional changes here
Would be good to explain what you did refactor here, instead of me trying
to reconstruct it from the patch. Especially pre-coffee that helps :-)
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> Cc: Juston Li <juston.li@intel.com>
> ---
> drivers/gpu/drm/drm_dp_mst_topology.c | 71 ++++++++++++++++-----------
> 1 file changed, 42 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 9b1b5c9b1fa0..2ab16c9e6243 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -1879,39 +1879,48 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
>
> mutex_lock(&mgr->payload_lock);
> for (i = 0; i < mgr->max_payloads; i++) {
> + struct drm_dp_vcpi *vcpi = mgr->proposed_vcpis[i];
> + struct drm_dp_payload *payload = &mgr->payloads[i];
> +
> /* solve the current payloads - compare to the hw ones
> - update the hw view */
> req_payload.start_slot = cur_slots;
> - if (mgr->proposed_vcpis[i]) {
> - port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);
> + if (vcpi) {
> + port = container_of(vcpi, struct drm_dp_mst_port,
> + vcpi);
> port = drm_dp_get_validated_port_ref(mgr, port);
> if (!port) {
> mutex_unlock(&mgr->payload_lock);
> return -EINVAL;
> }
> - req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots;
> - req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi;
> + req_payload.num_slots = vcpi->num_slots;
> + req_payload.vcpi = vcpi->vcpi;
> } else {
> port = NULL;
> req_payload.num_slots = 0;
> }
>
> - mgr->payloads[i].start_slot = req_payload.start_slot;
> + payload->start_slot = req_payload.start_slot;
> /* work out what is required to happen with this payload */
> - if (mgr->payloads[i].num_slots != req_payload.num_slots) {
> + if (payload->num_slots != req_payload.num_slots) {
>
> /* need to push an update for this payload */
> if (req_payload.num_slots) {
> - drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload);
> - mgr->payloads[i].num_slots = req_payload.num_slots;
> - mgr->payloads[i].vcpi = req_payload.vcpi;
> - } else if (mgr->payloads[i].num_slots) {
> - mgr->payloads[i].num_slots = 0;
> - drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]);
> - req_payload.payload_state = mgr->payloads[i].payload_state;
> - mgr->payloads[i].start_slot = 0;
> + drm_dp_create_payload_step1(mgr, vcpi->vcpi,
> + &req_payload);
> + payload->num_slots = req_payload.num_slots;
> + payload->vcpi = req_payload.vcpi;
> +
> + } else if (payload->num_slots) {
> + payload->num_slots = 0;
> + drm_dp_destroy_payload_step1(mgr, port,
> + payload->vcpi,
> + payload);
> + req_payload.payload_state =
> + payload->payload_state;
> + payload->start_slot = 0;
> }
> - mgr->payloads[i].payload_state = req_payload.payload_state;
> + payload->payload_state = req_payload.payload_state;
> }
> cur_slots += req_payload.num_slots;
>
> @@ -1920,22 +1929,26 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
> }
>
> for (i = 0; i < mgr->max_payloads; i++) {
> - if (mgr->payloads[i].payload_state == DP_PAYLOAD_DELETE_LOCAL) {
> - DRM_DEBUG_KMS("removing payload %d\n", i);
> - for (j = i; j < mgr->max_payloads - 1; j++) {
> - memcpy(&mgr->payloads[j], &mgr->payloads[j + 1], sizeof(struct drm_dp_payload));
> - mgr->proposed_vcpis[j] = mgr->proposed_vcpis[j + 1];
> - if (mgr->proposed_vcpis[j] && mgr->proposed_vcpis[j]->num_slots) {
> - set_bit(j + 1, &mgr->payload_mask);
> - } else {
> - clear_bit(j + 1, &mgr->payload_mask);
> - }
> - }
> - memset(&mgr->payloads[mgr->max_payloads - 1], 0, sizeof(struct drm_dp_payload));
> - mgr->proposed_vcpis[mgr->max_payloads - 1] = NULL;
> - clear_bit(mgr->max_payloads, &mgr->payload_mask);
> + if (mgr->payloads[i].payload_state != DP_PAYLOAD_DELETE_LOCAL)
> + continue;
> +
> + DRM_DEBUG_KMS("removing payload %d\n", i);
> + for (j = i; j < mgr->max_payloads - 1; j++) {
> + mgr->payloads[j] = mgr->payloads[j + 1];
> + mgr->proposed_vcpis[j] = mgr->proposed_vcpis[j + 1];
>
> + if (mgr->proposed_vcpis[j] &&
> + mgr->proposed_vcpis[j]->num_slots) {
> + set_bit(j + 1, &mgr->payload_mask);
> + } else {
> + clear_bit(j + 1, &mgr->payload_mask);
> + }
> }
> +
> + memset(&mgr->payloads[mgr->max_payloads - 1], 0,
> + sizeof(struct drm_dp_payload));
> + mgr->proposed_vcpis[mgr->max_payloads - 1] = NULL;
> + clear_bit(mgr->max_payloads, &mgr->payload_mask);
With the commit message improved to mention
- Add local variables in the first loop
- Early continue to reduce 1 indent in the 2nd loop
this is Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> }
> mutex_unlock(&mgr->payload_lock);
>
> --
> 2.19.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2018-12-14 8:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 1:25 [WIP PATCH 00/15] MST refcounting/atomic helpers cleanup Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 01/15] drm/dp_mst: Remove bogus conditional in drm_dp_update_payload_part1() Lyude Paul
2018-12-14 8:42 ` Daniel Vetter
2018-12-17 20:09 ` Wentland, Harry
2018-12-14 1:25 ` [WIP PATCH 02/15] drm/dp_mst: Refactor drm_dp_update_payload_part1() Lyude Paul
2018-12-14 8:47 ` Daniel Vetter [this message]
2018-12-17 20:27 ` Wentland, Harry
2018-12-14 1:25 ` [WIP PATCH 03/15] drm/dp_mst: Introduce new refcounting scheme for mstbs and ports Lyude Paul
2018-12-14 9:29 ` Daniel Vetter
2018-12-18 21:27 ` Lyude Paul
2018-12-19 12:48 ` Daniel Vetter
2018-12-19 18:36 ` Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 04/15] drm/dp_mst: Stop releasing VCPI when removing ports from topology Lyude Paul
2018-12-14 9:40 ` Daniel Vetter
2018-12-14 1:25 ` [WIP PATCH 05/15] drm/dp_mst: Fix payload deallocation on hotplugs using malloc refs Lyude Paul
2018-12-14 9:38 ` Daniel Vetter
2018-12-18 22:02 ` Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 06/15] drm/i915: Keep malloc references to MST ports Lyude Paul
2018-12-14 9:32 ` Daniel Vetter
2018-12-18 21:52 ` Lyude Paul
2018-12-19 13:20 ` Daniel Vetter
2018-12-14 1:25 ` [WIP PATCH 07/15] drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector() Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 08/15] drm/nouveau: Remove unnecessary VCPI checks in nv50_msto_cleanup() Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 09/15] drm/nouveau: Fix potential use-after-frees for MSTCs Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 10/15] drm/nouveau: Stop unsetting mstc->port, use malloc refs Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 11/15] drm/nouveau: Grab payload lock in nv50_msto_payload() Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 12/15] drm/dp_mst: Add some atomic state iterator macros Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 13/15] drm/dp_mst: Start tracking per-port VCPI allocations Lyude Paul
2018-12-14 16:37 ` Daniel Vetter
2018-12-14 1:25 ` [WIP PATCH 14/15] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check() Lyude Paul
2018-12-14 1:25 ` [WIP PATCH 15/15] 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=20181214084743.GM21184@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=Jerry.Zuo@amd.com \
--cc=airlied@gmail.com \
--cc=airlied@linux.ie \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=juston.li@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime.ripard@bootlin.com \
--cc=nouveau@lists.freedesktop.org \
--cc=sean@poorly.run \
/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;
as well as URLs for NNTP newsgroup(s).