Lyude Paul
2019-Jan-28 21:03 UTC
[Nouveau] [PATCH] drm/nouveau: Don't WARN_ON VCPI allocation failures
This is much louder then we want. VCPI allocation failures are quite normal, since they will happen if any part of the modesetting process is interrupted by removing the DP MST topology in question. So just print a debugging message on VCPI failures instead. Signed-off-by: Lyude Paul <lyude at redhat.com> Fixes: f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream") Cc: Ben Skeggs <bskeggs at redhat.com> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Cc: <stable at vger.kernel.org> # v4.10+ --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 2e8a5fd9b262..09a9c747c7bb 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -811,7 +811,8 @@ nv50_msto_enable(struct drm_encoder *encoder) slots = drm_dp_find_vcpi_slots(&mstm->mgr, mstc->pbn); r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, mstc->pbn, slots); - WARN_ON(!r); + if (!r) + DRM_DEBUG_KMS("Failed to allocate VCPI\n"); if (!mstm->links++) nv50_outp_acquire(mstm->outp); -- 2.20.1
Sasha Levin
2019-Jan-29 23:15 UTC
[Nouveau] [PATCH] drm/nouveau: Don't WARN_ON VCPI allocation failures
Hi, [This is an automated email] This commit has been processed because it contains a "Fixes:" tag, fixing commit: f479c0ba4a17 drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream. The bot has tested the following trees: v4.20.5, v4.19.18, v4.14.96. v4.20.5: Build OK! v4.19.18: Build OK! v4.14.96: Failed to apply! Possible dependencies: Unable to calculate How should we proceed with this patch? -- Thanks, Sasha
Possibly Parallel Threads
- [PATCH 4.19 092/190] drm/nouveau: Dont WARN_ON VCPI allocation failures
- [PATCH 4.19 092/190] drm/nouveau: Dont WARN_ON VCPI allocation failures
- [PATCH AUTOSEL 4.19 070/167] drm/nouveau: Don't WARN_ON VCPI allocation failures
- [PATCH v3 4/4] drm/nouveau: Move PBN and VCPI allocation into nv50_head_atom
- [PATCH 2/6] drm/nouveau: Use drm_dp_get_payload_info() for getting payload/vcpi