From nobody Sun Feb 8 02:21:41 2026 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 F0615178212; Wed, 27 Mar 2024 12:23:27 +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=1711542208; cv=none; b=Bs2ricAGm3VsNlyhz/IKNjHnyXSeY1YsAzaowuWzcZ2edTEskqjumvh9uz+G6stjanGvLZHUc1rUP92/VN4X4Yu6UxKQ3opzdlCVeqojXDItVrHzNCoiDqQ/0liQu6WLzRckDTPGvmQ9dKfANpexJBTyCPSa4ufCx90pWnHxFD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711542208; c=relaxed/simple; bh=l5oBahL9SUldv/HYa6j3iqn3LaE5XKswTx4m1UtWZo8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Cg6PNxdbAdw7WoS1YXgVIqIdoKId0iiWGSLeg4UTBSqYOfhF1jBXWmY7DPujssNaBD3bySTd8jGEeCnry2j+NrKaJyghyrgvs2nFPVQDcqzK59pyqo/vPikwe3865CJ0FYDZBnVocbLyS2rLZzBVUjSHW/526nGptjWjOGJOX2k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nxuPcosA; 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="nxuPcosA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93F93C433F1; Wed, 27 Mar 2024 12:23:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711542207; bh=l5oBahL9SUldv/HYa6j3iqn3LaE5XKswTx4m1UtWZo8=; h=From:To:Cc:Subject:Date:From; b=nxuPcosAUFDMTlMvHEroHh7PsIc3IqE+J30cNpGn/Dio/rk+TyJ5iysQID9JZbwLV lDOXiLmCJ3H6aT6cmNc/bdUJJqj2+ZALSuaSzUGOJ6ijzHXbOoHJWVIIE2UtAC2ILQ zrffpQfE7ev3xy/jbTulUTf3OzV3gvpytUxiys/F4wz7I/yFcM7sMNxEtha3qXDFKX xsZfxkxSPdrfD7GWrrkOKA3s/1WgoSW9XNPYSCKyCOtROu7bNN+Hv5ggnfbqxgJ9Jc PhfboWDxXbG9AcNStW2dm+Q4EDu9cyLmMv2lmtoafJ94FprjBeSxN9FUxTvyN3kxGT xHkxTR00HtB1w== 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.4-stable tree Date: Wed, 27 Mar 2024 08:23:25 -0400 Message-ID: <20240327122325.2838517-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.4-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