From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E53F70838; Mon, 23 Jun 2025 21:09:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750712995; cv=none; b=R+vl1g+ETIN0iFfPt9eJAvz/c8l2XOYpKRfyguZuQJfqyZCrX/Detcq8gODWBBfGoWrwvVyVXBmYJoLlUZ2w0+Fv68UgnAd0iYfZWbfeq+5CJ/vAcgtc3tezVbZChK4GGuDTgOOYTP5oBZbQjYzSf0QK0LBk5ZPwdf0Ecmt81LM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750712995; c=relaxed/simple; bh=y8buJQi5asKC/xAA/Y7KnFCcMbfYmRASqv57rNxbYL4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hTldwVsEeYkOrEv41ufOZCUHqUFenl/H8n4/psu/33ru3cFJ21C19oH1j4feh+QktI8fQba1hXR5AJyBptqLm1sv4/inlRaO29oQtkui7L3GGBPY8cEumKYBv6onS14p2JKVpjDUB3BUpkcvpjNSWMBXpE2Tz+KSDgC834MsTQQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cZsibhmr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cZsibhmr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1BEBC4CEEA; Mon, 23 Jun 2025 21:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750712995; bh=y8buJQi5asKC/xAA/Y7KnFCcMbfYmRASqv57rNxbYL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cZsibhmrPz4Vj9g2VQj2ofDY5pB1pVPjlCFGQK+yFHpw6Xm2Zm13MmiIkBdD3Va6B HS0FbbPfB7dyJyBhrqZd3lQzXt6oBi+oXZgJwbg9A0H92Yo8TWEoqQR2iZNAiXGDLZ qqy8Mz1D/9qX53sL27feuK0s/q6IitwkPf+LXRIQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rodrigo Siqueira , Alex Deucher , Sasha Levin Subject: [PATCH 6.15 292/592] drm/amdgpu/gfx9: fix CSIB handling Date: Mon, 23 Jun 2025 15:04:10 +0200 Message-ID: <20250623130707.317163394@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130700.210182694@linuxfoundation.org> References: <20250623130700.210182694@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher [ Upstream commit a4a4c0ae6742ec7d6bf1548d2c6828de440814a0 ] We shouldn't return after the last section. We need to update the rest of the CSIB. Reviewed-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index d7db4cb907ae5..d725e2e230a3d 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -1649,8 +1649,6 @@ static void gfx_v9_0_get_csb_buffer(struct amdgpu_device *adev, PACKET3_SET_CONTEXT_REG_START); for (i = 0; i < ext->reg_count; i++) buffer[count++] = cpu_to_le32(ext->extent[i]); - } else { - return; } } } -- 2.39.5