From nobody Sun Feb 8 02:22:01 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 BFF37149DE6; Wed, 27 Mar 2024 12:13:02 +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=1711541582; cv=none; b=gM5Qk0505Y1TorHAR2vuK2Z8SnhqdwKbk0lrEaTmNR+fta1Nca/bDR0uv42UewX5bFiWap3vzcc2/KQNBU8p/AXrv6/alt3+bQbzGQvq/cXEdtoVVwcdzCU0CYaw4eqWfMp+ULcWniL6PoRt53JGqOnhYPcgpm0RkmnhX52RJ7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541582; c=relaxed/simple; bh=rwyQLzSPJ2i0LvxtIc1Tgco9OhoYWE7NrxS9+kcZ3Ig=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rBGTGKH21YONUKKc8GaKZTS8JceMEi/FegmJWrejjP81cT/CG8FnhZZiae1EKIAQiUx4PLAwSPOV/oC8k5BUrWrWG/P82MU7tuFvL/KK9OK6Q71cHeTmFDB1MjzDXFOhggo4+XNopJ+QDVHJSM18UKqVk8L+QA1yTP64CD1s23M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GrrPVtps; 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="GrrPVtps" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26512C433C7; Wed, 27 Mar 2024 12:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541582; bh=rwyQLzSPJ2i0LvxtIc1Tgco9OhoYWE7NrxS9+kcZ3Ig=; h=From:To:Cc:Subject:Date:From; b=GrrPVtpsmN3sON+5RjxakYZwNOONJWG5OQCbYNo0Q2W95xLsZ5SmySGkhb0ZtBvuF nNSF55JPX4O0aUKKwQWeunRGCI8EIyj7Icyr/GxcYY1pv42ScerfH2/T1/nDym5/8+ 4p7dQhLC4PgP+vL5QblYrYqVjvjxqNddK+yJEp7VbU+jXVo+YnIPEwnni0xO0zUyt6 bEfV3HEOfBlHto4iMEKVRYnen/86p3RS6gHIiQkll5r+9OxAI9OYdClq/Uo0k8Mq+s aIDqIghJLi0Zu9LmKqgxbO8i5n+0XwSOSnsWHAcowsS3WGzFBpZ3Qw1IFN3Yp2j64p RrapnPRWZjR1g== From: Sasha Levin To: stable@vger.kernel.org, ovidiu.bunea@amd.com Cc: Mario Limonciello , Alex Deucher , Charlene Liu , Alex Hung , Daniel Wheeler , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/amd/display: Fix DML2 watermark calculation" failed to apply to 6.1-stable tree Date: Wed, 27 Mar 2024 08:12:59 -0400 Message-ID: <20240327121300.2829975-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 6.1-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: Alex Hung Reviewed-by: Charlene Liu Tested-by: Daniel Wheeler ------------------ original commit in Linus's tree ------------------ From 2254ab45dab22a18fdd29fe0e471706872c00093 Mon Sep 17 00:00:00 2001 From: Ovidiu Bunea Date: Mon, 18 Dec 2023 21:40:45 -0500 Subject: [PATCH] drm/amd/display: Fix DML2 watermark calculation [Why] core_mode_programming in DML2 should output watermark calculations to locals, but it incorrectly uses mode_lib [How] update code to match HW DML2 Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Charlene Liu Acked-by: Alex Hung Signed-off-by: Ovidiu Bunea Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- .../drm/amd/display/dc/dml2/display_mode_core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c b/driv= ers/gpu/drm/amd/display/dc/dml2/display_mode_core.c index a6b938a12de13..9be5ebf3a8c0b 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c @@ -9446,13 +9446,13 @@ void dml_core_mode_programming(struct display_mode_= lib_st *mode_lib, const struc CalculateWatermarks_params->CompressedBufferSizeInkByte =3D locals->Comp= ressedBufferSizeInkByte; =20 // Output - CalculateWatermarks_params->Watermark =3D &s->dummy_watermark; // Waterm= arks *Watermark - CalculateWatermarks_params->DRAMClockChangeSupport =3D &mode_lib->ms.sup= port.DRAMClockChangeSupport[0]; - CalculateWatermarks_params->MaxActiveDRAMClockChangeLatencySupported =3D= &s->dummy_single_array[0][0]; // dml_float_t *MaxActiveDRAMClockChangeLate= ncySupported[] - CalculateWatermarks_params->SubViewportLinesNeededInMALL =3D &mode_lib->= ms.SubViewportLinesNeededInMALL[j]; // dml_uint_t SubViewportLinesNeededInM= ALL[] - CalculateWatermarks_params->FCLKChangeSupport =3D &mode_lib->ms.support.= FCLKChangeSupport[0]; - CalculateWatermarks_params->MaxActiveFCLKChangeLatencySupported =3D &s->= dummy_single[0]; // dml_float_t *MaxActiveFCLKChangeLatencySupported - CalculateWatermarks_params->USRRetrainingSupport =3D &mode_lib->ms.suppo= rt.USRRetrainingSupport[0]; + CalculateWatermarks_params->Watermark =3D &locals->Watermark; // Waterma= rks *Watermark + CalculateWatermarks_params->DRAMClockChangeSupport =3D &locals->DRAMCloc= kChangeSupport; + CalculateWatermarks_params->MaxActiveDRAMClockChangeLatencySupported =3D= locals->MaxActiveDRAMClockChangeLatencySupported; // dml_float_t *MaxActiv= eDRAMClockChangeLatencySupported[] + CalculateWatermarks_params->SubViewportLinesNeededInMALL =3D locals->Sub= ViewportLinesNeededInMALL; // dml_uint_t SubViewportLinesNeededInMALL[] + CalculateWatermarks_params->FCLKChangeSupport =3D &locals->FCLKChangeSup= port; + CalculateWatermarks_params->MaxActiveFCLKChangeLatencySupported =3D &loc= als->MaxActiveFCLKChangeLatencySupported; // dml_float_t *MaxActiveFCLKChan= geLatencySupported + CalculateWatermarks_params->USRRetrainingSupport =3D &locals->USRRetrain= ingSupport; =20 CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport( &mode_lib->scratch, --=20 2.43.0