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 AE863CE79CF for ; Wed, 20 Sep 2023 11:47:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234582AbjITLrP (ORCPT ); Wed, 20 Sep 2023 07:47:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234592AbjITLrO (ORCPT ); Wed, 20 Sep 2023 07:47:14 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44DF0B0 for ; Wed, 20 Sep 2023 04:47:09 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94613C433CB; Wed, 20 Sep 2023 11:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1695210428; bh=9CGDgVKsifeYqfZrwlkgSwDkYXSqDhGVABbvC8BGZ8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBjY1OuOfnlzjYYK/KJxc1P7w/VsAXczPox3rr01mWXSWDvJx0/no3XczN6FpECet bC0602Hth57BBn/Xd8ahjr16A64tcyQh3SbMJbF5jb+vKeSGrFQUY3ILeYRcooFfg5 P39HSUumCUFXDBU2asN+dZ9GhP7nj8/O6+z7wb6w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lijo Lazar , James Zhu , Alex Deucher , Sasha Levin Subject: [PATCH 6.5 074/211] drm/amdgpu: Update ring scheduler info as needed Date: Wed, 20 Sep 2023 13:28:38 +0200 Message-ID: <20230920112848.091483524@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230920112845.859868994@linuxfoundation.org> References: <20230920112845.859868994@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.5-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lijo Lazar [ Upstream commit 6cb209ed68e45c8e4b71d97a037ac6b7dbce9b50 ] Not all rings have scheduler associated. Only update scheduler data for rings with scheduler. It could result in out of bound access as total rings are more than those associated with particular IPs. Signed-off-by: Lijo Lazar Reviewed-by: James Zhu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c index 72b629a78c62c..d0fc62784e821 100644 --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c @@ -134,7 +134,7 @@ static int aqua_vanjaram_xcp_sched_list_update( for (i = 0; i < AMDGPU_MAX_RINGS; i++) { ring = adev->rings[i]; - if (!ring || !ring->sched.ready) + if (!ring || !ring->sched.ready || ring->no_scheduler) continue; aqua_vanjaram_xcp_gpu_sched_update(adev, ring, ring->xcp_id); -- 2.40.1