lkml.org 
[lkml]   [2019]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 070/167] drm/nouveau: Don't WARN_ON VCPI allocation failures
    Date
    From: Lyude Paul <lyude@redhat.com>

    [ Upstream commit b513a18cf1d705bd04efd91c417e79e4938be093 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 f889d41a281fa..5e01bfb69d7a3 100644
    --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
    +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
    @@ -759,7 +759,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
    \
     
     \ /
      Last update: 2019-09-03 18:28    [W:2.420 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site