From patchwork Tue Nov 3 20:32:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 316769 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=-12.8 required=3.0 tests=BAYES_00,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=unavailable 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 999A4C388F7 for ; Tue, 3 Nov 2020 22:06:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5EA0F223AB for ; Tue, 3 Nov 2020 22:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604441161; bh=Vz7mWas5l7Cj4YtdwXe/OVrmAq1W+gMt/ahKzluJz0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xMCSVF2/Ls0OOqbkDZ6HsYkI2B1wbVXzUfiwJM8OU9e0HdkpU6z7idXVmMr57WPhO QoAAkjHue8Dj1zQ9XSxfLDLl7T4xGFn+ERtzD56ook4xcfU9+Ecy44OsBfuXoATDQd +WGUtCyzyD5Xkz0hPBjg3JMN8OgL8EP68KBUrKqM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730334AbgKCWF5 (ORCPT ); Tue, 3 Nov 2020 17:05:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:54208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730073AbgKCUmJ (ORCPT ); Tue, 3 Nov 2020 15:42:09 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 1D4A3223AB; Tue, 3 Nov 2020 20:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436128; bh=Vz7mWas5l7Cj4YtdwXe/OVrmAq1W+gMt/ahKzluJz0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RoDr1U7n1ioE2rz9b1Q8iYurGFHNxVuAcqp4KR9UhU7j5velAlw8l1/pzjcChAg25 7mjpILZOZCmHuWVsAVpFIPrZGNkAsKqU/95vtZj1tbO+czmQkS/CooTEjI669vxW4p bxeOTyTSvE8hhBIuHlmreRLw9Od8PvLpfDohA66E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luben Tuikov , Slava Abramov , Alex Deucher , Sasha Levin Subject: [PATCH 5.9 116/391] drm/amdgpu: No sysfs, not an error condition Date: Tue, 3 Nov 2020 21:32:47 +0100 Message-Id: <20201103203354.649857318@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luben Tuikov [ Upstream commit 5aea5327ea2ddf544cbeff096f45fc2319b0714e ] Not being able to create amdgpu sysfs attributes is not a fatal error warranting not to continue to try to bring up the display. Thus, if we get an error trying to create amdgpu sysfs attrs, report it and continue on to try to bring up a display. Signed-off-by: Luben Tuikov Acked-by: Slava Abramov Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index d0b8d0d341af5..2576c299958c5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3316,10 +3316,8 @@ fence_driver_init: flush_delayed_work(&adev->delayed_init_work); r = sysfs_create_files(&adev->dev->kobj, amdgpu_dev_attributes); - if (r) { + if (r) dev_err(adev->dev, "Could not create amdgpu device attr\n"); - return r; - } if (IS_ENABLED(CONFIG_PERF_EVENTS)) r = amdgpu_pmu_init(adev);