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=-13.1 required=3.0 tests=BAYES_00,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 12EE2C83017 for ; Tue, 27 Oct 2020 00:41:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D82C320760 for ; Tue, 27 Oct 2020 00:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603759307; bh=r9elibudGHXmx10/BpDXAg31w2XFaZ9O1NrZhZUe91Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Bt9aRS/DX1b+Tb2VDRvPLQu+XnB7Or09dTDpC01UhKkT48wkpoIVU0uF21lmUS7EC 1Sjnzz0PHyFMbhx0yiNj+lAW+UI6bxhQP0oH5N1xiVQntIFUxW+J7wMv+4yP1zhnRU wgupGehfqCVuzn/ac/g/EqPApeCK+xsfY04PhO/I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2501914AbgJ0AjD (ORCPT ); Mon, 26 Oct 2020 20:39:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:50374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409162AbgJZXuj (ORCPT ); Mon, 26 Oct 2020 19:50:39 -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 C5157216FD; Mon, 26 Oct 2020 23:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756239; bh=r9elibudGHXmx10/BpDXAg31w2XFaZ9O1NrZhZUe91Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BNR6maTxBf0w69DcsgcvZ1PGtOK0DvJXzfPtVvxB38/6y4wKt0sj0wwpa0Vi0fEPY YAhlGd48khC/CPAqGu9+EiCPdCRzlUz1L0FvpYQ2Fe2ZohUkifFPl3uM2Fl/sj4xrc TN1obZU/6pMhtXy5Viq7jTKnE8J4D88GRefVnYFM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luben Tuikov , Slava Abramov , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.9 076/147] drm/amdgpu: No sysfs, not an error condition Date: Mon, 26 Oct 2020 19:47:54 -0400 Message-Id: <20201026234905.1022767-76-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026234905.1022767-1-sashal@kernel.org> References: <20201026234905.1022767-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ int amdgpu_device_init(struct amdgpu_device *adev, 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); -- 2.25.1