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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 6BE53C432BE for ; Mon, 16 Aug 2021 14:51:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 545E560EBD for ; Mon, 16 Aug 2021 14:51:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232711AbhHPOwC (ORCPT ); Mon, 16 Aug 2021 10:52:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231971AbhHPOv5 (ORCPT ); Mon, 16 Aug 2021 10:51:57 -0400 X-Greylist: delayed 593 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 16 Aug 2021 07:40:50 PDT Received: from gregdf.com (gregdf.com [IPv6:2001:41d0:304:200::b62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50DEFC061796 for ; Mon, 16 Aug 2021 07:40:50 -0700 (PDT) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:2c9:7bb0:47f6:13d5:48e6:af34]) by mail.gregdf.com (Postfix) with ESMTPSA id CEAB830A0AF; Mon, 16 Aug 2021 16:30:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gregdf.com; s=mail; t=1629124252; bh=eLQYMMz0CluCtWGgDPOvxIf0ym6QLpqRpYmB5sXLSRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ojf9VPbTWDlE3MkJMGYFcgu9b1LH8N6yNKO9Dl3zM+9Ae93byP6RuK+RS6sFFq7BJ hTinfBcDH70yIsWbYb5+jMJkFCjhPvhGfXFuX6qnf9mr23CQqXPm06pvaFxCsKlkI2 BOYot8AtZjTHWQJ0yMUDi1F6jmt8ZEvqlRojVVHY= From: lnx7586@gregdf.com To: mikpelinux@gmail.com Cc: daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org, jason@jlekstrand.net, linux-kernel@vger.kernel.org, Greg Depoire--Ferrer , Duncan Subject: [PATCH] drm/ttm: allow debugfs_create_file() to fail in ttm_global_init() Date: Mon, 16 Aug 2021 16:30:46 +0200 Message-Id: <20210816143046.3320-1-lnx7586@gregdf.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Depoire--Ferrer Commit 69de4421bb4c ("drm/ttm: Initialize debugfs from ttm_global_init()") unintentionally made ttm_global_init() return early with an error when debugfs_create_file() fails. When CONFIG_DEBUG_FS is disabled, debugfs_create_file() returns a ENODEV error so the TTM device would fail to initialize. Instead of returning early with the error, print it and continue. ENODEV can be ignored because it just means that CONFIG_DEBUG_FS is disabled. Fixes: 69de4421bb4c ("drm/ttm: Initialize debugfs from ttm_global_init()") Reported-by: Mikael Pettersson Reported-by: Duncan Signed-off-by: Greg Depoire--Ferrer --- Hi, I had this bug as well with the nouveau driver after updating. This patch fixes it for me. drivers/gpu/drm/ttm/ttm_device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c index 74e3b460132b..12b73979c798 100644 --- a/drivers/gpu/drm/ttm/ttm_device.c +++ b/drivers/gpu/drm/ttm/ttm_device.c @@ -69,6 +69,7 @@ static int ttm_global_init(void) unsigned long num_pages, num_dma32; struct sysinfo si; int ret = 0; + int tmp; mutex_lock(&ttm_global_mutex); if (++ttm_glob_use_count > 1) @@ -78,9 +79,9 @@ static int ttm_global_init(void) ttm_debugfs_root = debugfs_create_dir("ttm", NULL); if (IS_ERR(ttm_debugfs_root)) { - ret = PTR_ERR(ttm_debugfs_root); - ttm_debugfs_root = NULL; - goto out; + tmp = PTR_ERR(ttm_debugfs_root); + if (tmp != -ENODEV) + pr_err("failed to create debugfs: %d", tmp); } /* Limit the number of pages in the pool to about 50% of the total -- 2.31.1