From nobody Tue May 14 04:41:30 2024 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 611FE1384B4; Wed, 27 Mar 2024 12:16:24 +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=1711541785; cv=none; b=gSjmdqt+K7lFIcy9rQzXXcq2unhgSW+QU5fUqZPT3w0rIC5YfUC/hT4eIxDFk+KAbo98FSEmP2IW3mu6THdyZs+JzVB5IvWmVoCLL9foDI5aL/K1Hqu5uKzl++xtzqACNFOYh5hoelP31JAvcwhDVQn6Ed+CjX5fb79Ztf48Z/w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541785; c=relaxed/simple; bh=jvGwVhy+8hKZu3JtFuZsALRvGxmYDs/oQgmGeuZMFFo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qT/knrwriuA1vnxPmLt21XIjHNM4kfgHGapVu2nTXZ/FX0116+9yGYPYlC7Jh2nro2aLcd6B8RDkSbIApMiJzDxngG8zb/YLUKZbJ480V/UoVTdRpg+hPiHyMQ/Tz4wssY7DTPL1lzC1Owjt8+nzGHRvl1mrickpcL5ZOXD+EPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C/5BgLsv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C/5BgLsv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BAE1C433C7; Wed, 27 Mar 2024 12:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541784; bh=jvGwVhy+8hKZu3JtFuZsALRvGxmYDs/oQgmGeuZMFFo=; h=From:To:Cc:Subject:Date:From; b=C/5BgLsv6WTlYDkMJDjXVjT+9aeQPTCQ8UINESfrWf5lvkdp6PVWaXipf4MNuj/vU VIFIUC5fkYlfUeC7XuIgx/Q+eng9MLu7SR7G3VxvoYSkg9ZajLbNQRM0S4dDQIpskE SNFiVeCPgA1ea7FD7MyCso1JnABRdILP+J2BmNFXQ6WS8S8nV7U3mts2gigobSCcRd xWIoVSZqPABKMsxxVqU+HPW1dUWm9qOMHVYJngWdabj2XJaCYKPpyp6jgKGEdEolsW LOX0JAJSy2sskKbW7qaX56JFMNkP766R/m7G7uwZdAPSzxB1qEA/Mqnisv2jy6A924 zywrDcsuMehFw== From: Sasha Levin To: stable@vger.kernel.org, wenjing.liu@amd.com Cc: Mario Limonciello , Alex Deucher , Rodrigo Siqueira , Nevenko Stupar , Chaitanya Dhere , Tom Chung , Daniel Wheeler , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/amd/display: fix incorrect mpc_combine array size" failed to apply to 5.15-stable tree Date: Wed, 27 Mar 2024 08:16:21 -0400 Message-ID: <20240327121621.2832656-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha Acked-by: Tom Chung Reviewed-by: Chaitanya Dhere Reviewed-by: Nevenko Stupar Reviewed-by: Rodrigo Siqueira Tested-by: Daniel Wheeler ------------------ original commit in Linus's tree ------------------ From 607e1b0cf480cb8dbd65b372397871d7389942b5 Mon Sep 17 00:00:00 2001 From: Wenjing Liu Date: Thu, 18 Jan 2024 15:14:15 -0500 Subject: [PATCH] drm/amd/display: fix incorrect mpc_combine array size [why] MAX_SURFACES is per stream, while MAX_PLANES is per asic. The mpc_combine is an array that records all the planes per asic. Therefore MAX_PLANES should be used as the array size. Using MAX_SURFACES causes array overflow when there are more than 3 planes. [how] Use the MAX_PLANES for the mpc_combine array size. Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Rodrigo Siqueira Reviewed-by: Nevenko Stupar Reviewed-by: Chaitanya Dhere Acked-by: Tom Chung Signed-off-by: Wenjing Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c b/drivers= /gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c index 9b80f65c04664..a7981a0c4158f 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c @@ -1113,7 +1113,7 @@ struct pipe_slice_table { struct pipe_ctx *pri_pipe; struct dc_plane_state *plane; int slice_count; - } mpc_combines[MAX_SURFACES]; + } mpc_combines[MAX_PLANES]; int mpc_combine_count; }; =20 --=20 2.43.0