From: Lyude Paul Subject: [PATCH 1/3] drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN Date: Fri, 15 Nov 2019 16:07:18 -0500 Message-ID: <20191115210728.3467-2-lyude@redhat.com> References: <20191115210728.3467-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20191115210728.3467-1-lyude@redhat.com> Sender: stable-owner@vger.kernel.org To: nouveau@lists.freedesktop.org Cc: Ben Skeggs , Daniel Vetter , David Airlie , Jerry Zuo , Harry Wentland , Juston Li , Sean Paul , Laurent Pinchart , stable@vger.kernel.org, David Airlie , Daniel Vetter , Sam Ravnborg , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org 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. 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(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouv= eau/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, =09struct nv50_mstm *mstm =3D mstc->mstm; =09struct nv50_head_atom *asyh =3D nv50_head_atom(crtc_state); =09int slots; +=09int ret; =20 -=09if (crtc_state->mode_changed || crtc_state->connectors_changed) { -=09=09/* -=09=09 * When restoring duplicated states, we need to make sure that -=09=09 * the bw remains the same and avoid recalculating it, as the -=09=09 * connector's bpc may have changed after the state was -=09=09 * duplicated -=09=09 */ -=09=09if (!state->duplicated) { -=09=09=09const int bpp =3D connector->display_info.bpc * 3; -=09=09=09const int clock =3D crtc_state->adjusted_mode.clock; +=09ret =3D nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, +=09=09=09=09=09 mstc->native); +=09if (ret) +=09=09return ret; =20 -=09=09=09asyh->dp.pbn =3D drm_dp_calc_pbn_mode(clock, bpp); -=09=09} +=09if (!crtc_state->mode_changed && !crtc_state->connectors_changed) +=09=09return 0; =20 -=09=09slots =3D drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, -=09=09=09=09=09=09 mstc->port, -=09=09=09=09=09=09 asyh->dp.pbn); -=09=09if (slots < 0) -=09=09=09return slots; +=09/* +=09 * When restoring duplicated states, we need to make sure that the bw +=09 * remains the same and avoid recalculating it, as the connector's bpc +=09 * may have changed after the state was duplicated +=09 */ +=09if (!state->duplicated) { +=09=09const int bpp =3D connector->display_info.bpc * 3; +=09=09const int clock =3D crtc_state->adjusted_mode.clock; =20 -=09=09asyh->dp.tu =3D slots; +=09=09asyh->dp.pbn =3D drm_dp_calc_pbn_mode(clock, bpp); =09} =20 -=09return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, -=09=09=09=09=09 mstc->native); +=09slots =3D drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, mstc->port, +=09=09=09=09=09 asyh->dp.pbn); +=09if (slots < 0) +=09=09return slots; + +=09asyh->dp.tu =3D slots; + +=09return 0; } =20 static void --=20 2.21.0