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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 643B5ECAAA1 for ; Tue, 30 Aug 2022 17:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231431AbiH3R0V (ORCPT ); Tue, 30 Aug 2022 13:26:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231495AbiH3RZh (ORCPT ); Tue, 30 Aug 2022 13:25:37 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAA12C1659; Tue, 30 Aug 2022 10:23:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8116CB81C35; Tue, 30 Aug 2022 17:22:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF56BC433C1; Tue, 30 Aug 2022 17:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661880129; bh=EAJCYjhkJNORUUDynnZRYb9oNFCXK83WLB1Yzw2xubg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tLKukZ6NWQNpRoDZK82kpAssbUTMdBWHLzUlQdGXsbwGzvgS0Mp0RGrevm1m1D2GQ RdZov6WWVGq5gYoe5HjwiRujjHTdRtSRxRV8lCLDH7uyMxsRHg6Dq01bPoQfWXORqG x+UtDsOsZ4357GawzG9iwA2QlgLthuqi3kCdoX0PskAIqynMmzzIgzkg2+3PAqyoZv WNBtSop54C/QvkJPzJk15b5KbPguC4jz+6oGzYORrdDGYWpEZCe/I65C3lKONdTh/1 /c0S8shbj1IUS9wZrxZ0SPhc2wBW3budglvKO5+KPwMuMFNYUut1TGSetz2KLRW5Tx Rq/E3yILoHdQg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Candice Li , Hawking Zhang , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, tao.zhou1@amd.com, YiPeng.Chai@amd.com, lijo.lazar@amd.com, desowin@gmail.com, victor.skvortsov@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 07/23] drm/amdgpu: Check num_gfx_rings for gfx v9_0 rb setup. Date: Tue, 30 Aug 2022 13:21:24 -0400 Message-Id: <20220830172141.581086-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220830172141.581086-1-sashal@kernel.org> References: <20220830172141.581086-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: Candice Li [ Upstream commit c351938350ab9b5e978dede2c321da43de7eb70c ] No need to set up rb when no gfx rings. Signed-off-by: Candice Li Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index db27fcf87cd04..16cbae04078ad 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -2624,7 +2624,8 @@ static void gfx_v9_0_constants_init(struct amdgpu_device *adev) gfx_v9_0_tiling_mode_table_init(adev); - gfx_v9_0_setup_rb(adev); + if (adev->gfx.num_gfx_rings) + gfx_v9_0_setup_rb(adev); gfx_v9_0_get_cu_info(adev, &adev->gfx.cu_info); adev->gfx.config.db_debug2 = RREG32_SOC15(GC, 0, mmDB_DEBUG2); -- 2.35.1