From: Thierry Reding Subject: Re: [Nouveau] [PATCH 1/3] drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN Date: Mon, 18 Nov 2019 14:41:17 +0100 Message-ID: <20191118134117.GF2246533@ulmo> References: <20191115210728.3467-1-lyude@redhat.com> <20191115210728.3467-2-lyude@redhat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="lIrNkN/7tmsD/ALM" Return-path: Content-Disposition: inline In-Reply-To: <20191115210728.3467-2-lyude@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: Lyude Paul Cc: nouveau@lists.freedesktop.org, Sam Ravnborg , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Jerry Zuo , Sean Paul , Ben Skeggs , Daniel Vetter , David Airlie , Harry Wentland , Juston Li , Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org --lIrNkN/7tmsD/ALM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 15, 2019 at 04:07:18PM -0500, Lyude Paul wrote: > Since nv50_outp_atomic_check_view() can set crtc_state->mode_changed, we > probably should be calling it before handling any PBN changes. Just a > precaution. >=20 > Signed-off-by: Lyude Paul > Fixes: 232c9eec417a ("drm/nouveau: Use atomic VCPI helpers for MST") > Cc: Ben Skeggs > Cc: Daniel Vetter > Cc: David Airlie > Cc: Jerry Zuo > Cc: Harry Wentland > Cc: Juston Li > Cc: Sean Paul > Cc: Laurent Pinchart > Cc: # v5.1+ > --- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 44 ++++++++++++++----------- > 1 file changed, 24 insertions(+), 20 deletions(-) Looks reasonable: Reviewed-by: Thierry Reding > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/no= uveau/dispnv50/disp.c > index 549486f1d937..6327aaf37c08 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -770,32 +770,36 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, > struct nv50_mstm *mstm =3D mstc->mstm; > struct nv50_head_atom *asyh =3D nv50_head_atom(crtc_state); > int slots; > + int ret; > =20 > - if (crtc_state->mode_changed || crtc_state->connectors_changed) { > - /* > - * When restoring duplicated states, we need to make sure that > - * the bw remains the same and avoid recalculating it, as the > - * connector's bpc may have changed after the state was > - * duplicated > - */ > - if (!state->duplicated) { > - const int bpp =3D connector->display_info.bpc * 3; > - const int clock =3D crtc_state->adjusted_mode.clock; > + ret =3D nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, > + mstc->native); > + if (ret) > + return ret; > =20 > - asyh->dp.pbn =3D drm_dp_calc_pbn_mode(clock, bpp); > - } > + if (!crtc_state->mode_changed && !crtc_state->connectors_changed) > + return 0; > =20 > - slots =3D drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, > - mstc->port, > - asyh->dp.pbn); > - if (slots < 0) > - return slots; > + /* > + * When restoring duplicated states, we need to make sure that the bw > + * remains the same and avoid recalculating it, as the connector's bpc > + * may have changed after the state was duplicated > + */ > + if (!state->duplicated) { > + const int bpp =3D connector->display_info.bpc * 3; > + const int clock =3D crtc_state->adjusted_mode.clock; > =20 > - asyh->dp.tu =3D slots; > + asyh->dp.pbn =3D drm_dp_calc_pbn_mode(clock, bpp); > } > =20 > - return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, > - mstc->native); > + slots =3D drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, mstc->port, > + asyh->dp.pbn); > + if (slots < 0) > + return slots; > + > + asyh->dp.tu =3D slots; > + > + return 0; > } > =20 > static void > --=20 > 2.21.0 >=20 > _______________________________________________ > Nouveau mailing list > Nouveau@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/nouveau --lIrNkN/7tmsD/ALM Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAl3Sn30ACgkQ3SOs138+ s6EyzQ/+IArAf9hKT/2e6Mlc2DorOY+nMESy0hRnHy+ojoq/Wm8ZjvaoPjFW9fIv Z7x5IdYTFMGyaac16UK+fQUE39VklexlzkIuGWUlIAsQ1QJG3/XGDNdKOvBoMeqD DTsN6xI1UseWWk6NI06e/3IhdqqqT6bYMPXebxhObxgehgtAnwEoH4mFRB0ciWE1 Nh1anXSWdDaSG4ZdxY5RXOkGO4Nn6k3P7dEXZupjVqNon3sk/2aMPO26MKVEPpdB cQT6Div3Jo1nzDUMdl8suZqGpsVz6vfcRZ3rixBXIPXdPozXLMpcmx5qtTj2EJnZ xuhSZBQrj4yBhBQ2m6gUnS0t2kw3/r6yWUKr0vNzMpjTMa9d7Wy0bHPatPFQej6o z9sueVwgTQ1At0vu3kyVxxSR/OKScAkwtZfAgpKCJfQr+JrInLt7+1rAMhB/qYtF EIHCoxEja/K9DGLPECxIwmHAiEGAvC7dbnM4+tKYPc3z9z/mhTjZ80P33SHIz6dj 31TGEoDSmfFmseFCg7SCbsSnOMkH+V3kANq3WGn5jVneRp/tTOo2Ha13wtwH6Ymh vW2Y6iMu1l1vrChmZVtGlAianrGUPuOskhyxHsukETqFQ42fYqYdffdg87P9rnWV C+i2ZDFyahifVws7JFAGwXAzvCkdBLXdXSwOdpCvn3Uq0z77DnU= =Ojn4 -----END PGP SIGNATURE----- --lIrNkN/7tmsD/ALM--