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 13AD1C4360F for ; Fri, 22 Mar 2019 09:58:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D70AE206B7 for ; Fri, 22 Mar 2019 09:58:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553248681; bh=FCMryzBT3ZkdF1kRYPQv/3GUMv/oSF22ToVX2sxAkPI=; h=Subject:To:Cc:From:Date:List-ID:From; b=Z7OtMxhTRjR080ATTkoV8wyYd1RiEPrZNo/U8dcbnz3e0kmOb1ESg1iZefDYn45Du m1G0mvUc5jcq0YQQDX9Jy8TTadBD6B9/D5X24bgtp2nVkHhOAqUmHpZ3ii5jomvvO/ fjpV/FQWKr3gVYtDQPUDV0Tn+nz5Y3QXajNia/v4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727888AbfCVJ6B (ORCPT ); Fri, 22 Mar 2019 05:58:01 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:44901 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727781AbfCVJ6B (ORCPT ); Fri, 22 Mar 2019 05:58:01 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 6A0C546E2; Fri, 22 Mar 2019 05:58:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 22 Mar 2019 05:58:00 -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=vd6ftH VwJl83M2zTbDWtoRFcP9uUsUIbCu92+O9l3NI=; b=SEwH2i3MS1v5MC+JErlBrY QNmLTqNfW3gznc0twtp+g2h9/mxQAiMm3kBXVPFlD2dh2oMenzEuJJO4qQpXokIz kLn/zUgvaut8bDhD0rJK8qEHS1oKL/uOe21w98w7EsmrM37nTvaVt3Kz2bJyRSH7 hWQmqCHU4HAgGosDyR/rTh78Mv1aJDeulCqYPQfWxr+NPDGK7Qpdcitq4RuyboIL OAHBRQlUCE6gIszjX448mKxaykKC2WBDPC5000JaRP0hlAPzjdQG+6HWcYy4CrR6 j1CVayhqi4z0c2vxR0bGzX+Nz9ipaz2q0VV9JNyHNlcLgOs3ol8gDZcVsVEmIKQQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrjedugddtlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpedu 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 95875E475B; Fri, 22 Mar 2019 05:57:59 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/nouveau: Don't WARN_ON VCPI allocation failures" failed to apply to 4.19-stable tree To: lyude@redhat.com, bskeggs@redhat.com, stable@vger.kernel.org Cc: From: Date: Fri, 22 Mar 2019 10:57:48 +0100 Message-ID: <155324866815973@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 4.19-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);