From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E325C43381 for ; Fri, 22 Mar 2019 09:57:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E754206B7 for ; Fri, 22 Mar 2019 09:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553248672; bh=c8CUoRE3GJFXu9Zw5Ec3tXMvptQwo1WZSRwHU+7eSZY=; h=Subject:To:Cc:From:Date:List-ID:From; b=XRMf/m3R7PgNWJSeXmrdJt2PmtEufQSUu8ZhCkV5EjtZixG17VoBe76yiy171IyeZ Z2a4y/L8syzvySR1Wni1RWEQ/zugRvr8NMSzQ8wgeRZYkvlKpiRftmRRU21xL/SLoL pNy7qeP72Fhc1SF2f6eLo81+m+b+Q2NI0x7jGXO4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727827AbfCVJ5v (ORCPT ); Fri, 22 Mar 2019 05:57:51 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:43341 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727781AbfCVJ5v (ORCPT ); Fri, 22 Mar 2019 05:57:51 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id CA64E46E2; Fri, 22 Mar 2019 05:57:50 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 22 Mar 2019 05:57:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=bTiLuw 3JbLgpR9lkO8/JUN6GhVcAHjxCFwB88kgllXk=; b=mCC7qXdYEqrIoCMEO/qFBV SeY+ach6CtmhzxpQ7AzFqNLSTum8mbi3iln9Sznn9vF6tgpoME12ndHxAQPkYxOb NckyoXL2V3YQ4CZNpMxAd01t1OY675jc5Eif34+bWC1J8l5eHtsgVO+hqTsW+nA9 btOkRuPy2h17Cf+XjZCfbxxW9lMs8/+8D/a3biJtze6mreE3zF/suIl1ZBVbw5Lh Z1/Xh3tmI8XBzEGHztxJ2ede6+bJZoXsCsk1D5OZWBaJZn82sw37iH56P16Y+zHX py/4J6Brnnb816wByhd4sr7uM+x1034QQPKqB4a8io9D5tsy0s8JlElvH5jLNoVw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrjedugddtlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id BB954E44D7; Fri, 22 Mar 2019 05:57:49 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/nouveau: Don't WARN_ON VCPI allocation failures" failed to apply to 5.0-stable tree To: lyude@redhat.com, bskeggs@redhat.com, stable@vger.kernel.org Cc: From: Date: Fri, 22 Mar 2019 10:57:47 +0100 Message-ID: <155324866738100@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.0-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b513a18cf1d705bd04efd91c417e79e4938be093 Mon Sep 17 00:00:00 2001 From: Lyude Paul Date: Mon, 28 Jan 2019 16:03:50 -0500 Subject: [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 Fixes: f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream") Cc: Ben Skeggs Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: # v4.10+ Signed-off-by: Ben Skeggs diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index e8bb35f6d015..3f618ed4ec6f 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -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);