From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 070/167] drm/nouveau: Don't WARN_ON VCPI allocation failures Date: Tue, 3 Sep 2019 12:23:42 -0400 Message-ID: <20190903162519.7136-70-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162519.7136-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Ben Skeggs , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org RnJvbTogTHl1ZGUgUGF1bCA8bHl1ZGVAcmVkaGF0LmNvbT4KClsgVXBzdHJlYW0gY29tbWl0IGI1 MTNhMThjZjFkNzA1YmQwNGVmZDkxYzQxN2U3OWU0OTM4YmUwOTMgXQoKVGhpcyBpcyBtdWNoIGxv dWRlciB0aGVuIHdlIHdhbnQuIFZDUEkgYWxsb2NhdGlvbiBmYWlsdXJlcyBhcmUgcXVpdGUKbm9y bWFsLCBzaW5jZSB0aGV5IHdpbGwgaGFwcGVuIGlmIGFueSBwYXJ0IG9mIHRoZSBtb2Rlc2V0dGlu ZyBwcm9jZXNzIGlzCmludGVycnVwdGVkIGJ5IHJlbW92aW5nIHRoZSBEUCBNU1QgdG9wb2xvZ3kg aW4gcXVlc3Rpb24uIFNvIGp1c3QgcHJpbnQgYQpkZWJ1Z2dpbmcgbWVzc2FnZSBvbiBWQ1BJIGZh aWx1cmVzIGluc3RlYWQuCgpTaWduZWQtb2ZmLWJ5OiBMeXVkZSBQYXVsIDxseXVkZUByZWRoYXQu Y29tPgpGaXhlczogZjQ3OWMwYmE0YTE3ICgiZHJtL25vdXZlYXUva21zL252NTA6IGluaXRpYWwg c3VwcG9ydCBmb3IgRFAgMS4yIG11bHRpLXN0cmVhbSIpCkNjOiBCZW4gU2tlZ2dzIDxic2tlZ2dz QHJlZGhhdC5jb20+CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiBub3V2 ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ICMg djQuMTArClNpZ25lZC1vZmYtYnk6IEJlbiBTa2VnZ3MgPGJza2VnZ3NAcmVkaGF0LmNvbT4KU2ln bmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuYyB8IDMgKystCiAxIGZpbGUgY2hhbmdlZCwg MiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlz cG52NTAvZGlzcC5jCmluZGV4IGY4ODlkNDFhMjgxZmEuLjVlMDFiZmI2OWQ3YTMgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9kaXNwbnY1MC9kaXNwLmMKQEAgLTc1OSw3ICs3NTksOCBAQCBudjUw X21zdG9fZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIAogCXNsb3RzID0gZHJt X2RwX2ZpbmRfdmNwaV9zbG90cygmbXN0bS0+bWdyLCBtc3RjLT5wYm4pOwogCXIgPSBkcm1fZHBf bXN0X2FsbG9jYXRlX3ZjcGkoJm1zdG0tPm1nciwgbXN0Yy0+cG9ydCwgbXN0Yy0+cGJuLCBzbG90 cyk7Ci0JV0FSTl9PTighcik7CisJaWYgKCFyKQorCQlEUk1fREVCVUdfS01TKCJGYWlsZWQgdG8g YWxsb2NhdGUgVkNQSVxuIik7CiAKIAlpZiAoIW1zdG0tPmxpbmtzKyspCiAJCW52NTBfb3V0cF9h Y3F1aXJlKG1zdG0tPm91dHApOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL25vdXZlYXU= 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 63F07C3A5A2 for ; Tue, 3 Sep 2019 16:27:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D9C923878 for ; Tue, 3 Sep 2019 16:27:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528057; bh=HhjMPDYWRfDZBm9ZYOsXvGnHX2QeGL7rJQdeG914/1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=s16A1iUCYDUrcmKBnptHpMdJNJVlC36KCOLMzFgfizcL1V5P2EPFlj0bGItZUBxLg DmHNv/CtF6/qPnU72II1aiJMQRPYGj13TxjsDn/jvCIPXmN72Om91VAIG/CNkMzNny TbRCz25vLKN/hiQGuUWwOsNDAFbnOBasQuxdYGI8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730890AbfICQ1g (ORCPT ); Tue, 3 Sep 2019 12:27:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:48848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730852AbfICQ13 (ORCPT ); Tue, 3 Sep 2019 12:27:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 920FB23878; Tue, 3 Sep 2019 16:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528048; bh=HhjMPDYWRfDZBm9ZYOsXvGnHX2QeGL7rJQdeG914/1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UEPGl3zVYHlg0Lp7IqIfM/3pHGmWwoGB2qAicL8fNttm0BVEmnYVihsmww+k+OsKf f7rt21rER34hnnhwvdQKW4Z0wGr0y4eINtFX9/GW5iLp04dVuYr4Gpg+HBEH6L7h5H nBMKbwcrn8nQW6H7PFl6bZUKMQFw40yk1xVUj1fc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lyude Paul , Ben Skeggs , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, Sasha Levin Subject: [PATCH AUTOSEL 4.19 070/167] drm/nouveau: Don't WARN_ON VCPI allocation failures Date: Tue, 3 Sep 2019 12:23:42 -0400 Message-Id: <20190903162519.7136-70-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lyude Paul [ 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 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 Signed-off-by: Sasha Levin --- 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