From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.19 092/190] drm/nouveau: Dont WARN_ON VCPI allocation failures Date: Fri, 13 Sep 2019 14:05:47 +0100 Message-ID: <20190913130606.981926197@linuxfoundation.org> References: <20190913130559.669563815@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190913130559.669563815-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@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 Cc: Sasha Levin , Greg Kroah-Hartman , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Ben Skeggs , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: nouveau.vger.kernel.org WyBVcHN0cmVhbSBjb21taXQgYjUxM2ExOGNmMWQ3MDViZDA0ZWZkOTFjNDE3ZTc5ZTQ5MzhiZTA5 MyBdCgpUaGlzIGlzIG11Y2ggbG91ZGVyIHRoZW4gd2Ugd2FudC4gVkNQSSBhbGxvY2F0aW9uIGZh aWx1cmVzIGFyZSBxdWl0ZQpub3JtYWwsIHNpbmNlIHRoZXkgd2lsbCBoYXBwZW4gaWYgYW55IHBh cnQgb2YgdGhlIG1vZGVzZXR0aW5nIHByb2Nlc3MgaXMKaW50ZXJydXB0ZWQgYnkgcmVtb3Zpbmcg dGhlIERQIE1TVCB0b3BvbG9neSBpbiBxdWVzdGlvbi4gU28ganVzdCBwcmludCBhCmRlYnVnZ2lu ZyBtZXNzYWdlIG9uIFZDUEkgZmFpbHVyZXMgaW5zdGVhZC4KClNpZ25lZC1vZmYtYnk6IEx5dWRl IFBhdWwgPGx5dWRlQHJlZGhhdC5jb20+CkZpeGVzOiBmNDc5YzBiYTRhMTcgKCJkcm0vbm91dmVh dS9rbXMvbnY1MDogaW5pdGlhbCBzdXBwb3J0IGZvciBEUCAxLjIgbXVsdGktc3RyZWFtIikKQ2M6 IEJlbiBTa2VnZ3MgPGJza2VnZ3NAcmVkaGF0LmNvbT4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKQ2M6IG5vdXZlYXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiA8c3RhYmxl QHZnZXIua2VybmVsLm9yZz4gIyB2NC4xMCsKU2lnbmVkLW9mZi1ieTogQmVuIFNrZWdncyA8YnNr ZWdnc0ByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5l bC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5jIHwgMyAr Ky0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9kaXNwbnY1MC9kaXNwLmMgYi9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9kaXNwbnY1MC9kaXNwLmMKaW5kZXggZjg4OWQ0MWEyODFmYS4uNWUw MWJmYjY5ZDdhMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAv ZGlzcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuYwpAQCAt NzU5LDcgKzc1OSw4IEBAIG52NTBfbXN0b19lbmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNv ZGVyKQogCiAJc2xvdHMgPSBkcm1fZHBfZmluZF92Y3BpX3Nsb3RzKCZtc3RtLT5tZ3IsIG1zdGMt PnBibik7CiAJciA9IGRybV9kcF9tc3RfYWxsb2NhdGVfdmNwaSgmbXN0bS0+bWdyLCBtc3RjLT5w b3J0LCBtc3RjLT5wYm4sIHNsb3RzKTsKLQlXQVJOX09OKCFyKTsKKwlpZiAoIXIpCisJCURSTV9E RUJVR19LTVMoIkZhaWxlZCB0byBhbGxvY2F0ZSBWQ1BJXG4iKTsKIAogCWlmICghbXN0bS0+bGlu a3MrKykKIAkJbnY1MF9vdXRwX2FjcXVpcmUobXN0bS0+b3V0cCk7Ci0tIAoyLjIwLjEKCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWls aW5nIGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1 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.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_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 85A45C4CEC5 for ; Fri, 13 Sep 2019 13:16:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5905A214AE for ; Fri, 13 Sep 2019 13:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380593; bh=zOG44NvZII34L1rJxUscROwjCbvLnAhsBzplt5zW7gE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UNDFe5NJ2V8dbW2PTLuA5ra7QVj1V0bThZTuE9qYeROgNdksNwqR1OKCMqxAeZMQ5 zNvIjAt48UsSYLFGI0ihUTwMZrOnlOvLTUOsiqZ6tbZxT6X/S3f4EpBTBgSIJS2ZCp tPdA1yPDsCFuN0UJCogL38v4ie2qTW0huD0Q4Vps= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388708AbfIMNQc (ORCPT ); Fri, 13 Sep 2019 09:16:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:43214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389857AbfIMNQ2 (ORCPT ); Fri, 13 Sep 2019 09:16:28 -0400 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1886B20CC7; Fri, 13 Sep 2019 13:16:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380587; bh=zOG44NvZII34L1rJxUscROwjCbvLnAhsBzplt5zW7gE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rMGbEDQaIgJqotn8TtEeOZBstFJiWMDoNjzJtw9PyzKt3xBDCGT7V2l3gC92EYdmb JDGWcQ813/S2+3fbHX89DcHoAvPndziK9jr/JCM3KkAVhmBDVFXF4OHtMyqM2kzCws qaZHNKSEf664DVjsmgZ4pJwiucfImCJ4XB4DvfIY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lyude Paul , Ben Skeggs , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, Sasha Levin Subject: [PATCH 4.19 092/190] drm/nouveau: Dont WARN_ON VCPI allocation failures Date: Fri, 13 Sep 2019 14:05:47 +0100 Message-Id: <20190913130606.981926197@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190913130559.669563815@linuxfoundation.org> References: <20190913130559.669563815@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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