Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230613210529.552098-1-lyude@redhat.com>
In-Reply-To: <20230613210529.552098-1-lyude@redhat.com>
From:   Karol Herbst <kherbst@redhat.com>
Date:   Tue, 13 Jun 2023 23:23:32 +0200
Message-ID: <CACO55tvju6-pF-e9-Zx+7dNB1XKavaf74RW0yGheGzbM1w9nhg@mail.gmail.com>
Subject: Re: [PATCH] drm/nouveau/kms/nv50-: Fix drm_dp_remove_payload() invocation
To:     Lyude Paul <lyude@redhat.com>
Cc:     nouveau-devel@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, Ben Skeggs <bskeggs@redhat.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Jani Nikula <jani.nikula@intel.com>,
        Dave Airlie <airlied@redhat.com>,
        "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" 
        <nouveau@lists.freedesktop.org>,
        open list <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Tue, Jun 13, 2023 at 11:05=E2=80=AFPM Lyude Paul <lyude@redhat.com> wrot=
e:
>
> We changed the semantics for this in:
>
> e761cc20946a ("drm/display/dp_mst: Handle old/new payload states in drm_d=
p_remove_payload()")
>
> But I totally forgot to update this properly in nouveau. So, let's do tha=
t.
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>

Reviewed-by: Karol Herbst <kherbst@redhat.com>

> ---
>  drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/no=
uveau/dispnv50/disp.c
> index 5bb777ff13130..1637e08b548c2 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -909,15 +909,19 @@ nv50_msto_prepare(struct drm_atomic_state *state,
>         struct nouveau_drm *drm =3D nouveau_drm(msto->encoder.dev);
>         struct nv50_mstc *mstc =3D msto->mstc;
>         struct nv50_mstm *mstm =3D mstc->mstm;
> -       struct drm_dp_mst_atomic_payload *payload;
> +       struct drm_dp_mst_topology_state *old_mst_state;
> +       struct drm_dp_mst_atomic_payload *payload, *old_payload;
>
>         NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
>
> +       old_mst_state =3D drm_atomic_get_old_mst_topology_state(state, mg=
r);
> +
>         payload =3D drm_atomic_get_mst_payload_state(mst_state, mstc->por=
t);
> +       old_payload =3D drm_atomic_get_mst_payload_state(old_mst_state, m=
stc->port);
>
>         // TODO: Figure out if we want to do a better job of handling VCP=
I allocation failures here?
>         if (msto->disabled) {
> -               drm_dp_remove_payload(mgr, mst_state, payload, payload);
> +               drm_dp_remove_payload(mgr, mst_state, old_payload, payloa=
d);
>
>                 nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base=
.index, 0, 0, 0, 0);
>         } else {
> --
> 2.40.1
>