[PATCH] drm/nouveau: Don't WARN_ON VCPI allocation failures

* [PATCH] drm/nouveau: Don't WARN_ON VCPI allocation failures
@ 2019-01-28 21:03 Lyude Paul
       [not found] ` <20190128210352.18066-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
  2019-01-29 23:15 ` Sasha Levin
  0 siblings, 2 replies; 3+ messages in thread
From: Lyude Paul @ 2019-01-28 21:03 UTC (permalink / raw)
  To: nouveau
  Cc: Ben Skeggs, dri-devel, stable, David Airlie, Daniel Vetter,
	Karol Herbst, Sean Paul, Ilia Mirkin, linux-kernel

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@redhat.com>
Fixes: f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream")
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: <stable@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

^ permalink raw reply related	[flat|nested] 3+ messages in thread