OSDN Git Service

drm/nouveau: Don't WARN_ON VCPI allocation failures
authorLyude Paul <lyude@redhat.com>
Mon, 28 Jan 2019 21:03:50 +0000 (16:03 -0500)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 19 Feb 2019 22:59:58 +0000 (08:59 +1000)
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+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/disp.c

index e8bb35f..3f618ed 100644 (file)
@@ -817,7 +817,8 @@ nv50_msto_enable(struct drm_encoder *encoder)
 
        r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, armh->dp.pbn,
                                     armh->dp.tu);
-       WARN_ON(!r);
+       if (!r)
+               DRM_DEBUG_KMS("Failed to allocate VCPI\n");
 
        if (!mstm->links++)
                nv50_outp_acquire(mstm->outp);