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 522E4190662; Wed, 27 Mar 2024 12:27: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=1711542422; cv=none; b=ipxDPUt4DubSYVFe/9WSS2d7GCWJFfB36z0U9EX5c/3h/5DauQjjCLRxgKr9ASOPrS+AdyJ8oIoR2pry1AjE2ME/gR+31zZEuzDjqIIr1rpBcXIngRVfSb6S+o2oScVShXikrHTwPl/L08q0iAfiJN+LLxZLypyrIMA5dHHGfeY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711542422; c=relaxed/simple; bh=B+QsAjaDKUp8NEDiMq24j869qqvgZMCkBIjbTVXmtsc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=utuOhFlZhyGz9P+lZRSgVKIwz7wU0KugQfC3RDe6hXvC4ic8rp31R5wxnEdTVT0lGuHIX1YgQ6G+AgzIGWV5TuLSVlT0n45uZoajKZOfqZCYsyNIAsWVbtx3K5FlcsmnkxRVoDs+etQ7H/03YqLiV1VpZ8nWDvAiabDj0f8L5KY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i48SaBQc; 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="i48SaBQc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD175C43390; Wed, 27 Mar 2024 12:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711542422; bh=B+QsAjaDKUp8NEDiMq24j869qqvgZMCkBIjbTVXmtsc=; h=From:To:Cc:Subject:Date:From; b=i48SaBQcaINa6+IPEjOQFA+fWfexiX8GeCEve6iQPLktLa7cSsJGi+V2pRcrr1Ey4 HsiJxalU26685ujunfiGZR24yaCBgK2FIf6XabnJdc8Ikh6KGArE1pyiotNK/QKRWX 7YvzQK7bCU30MRbJlC1JUfHrObUzKP3BWbWpLa2LMOPAdb020uULdkLC6AkJSh+ZTi 4t+NWJF2BI3wpIV13tBXMbWwOvLACYu3SCnzbkTAAR7f6fJFfM5W4VNHscqF30J4eU AgUNeVYmv87qtB0EZZ0BFR42/Ep5yVeXpcWQjTdtYgCIYjVEnM6ga4M6Vb3KnGbT9E 3iHJfkry5ndrQ== 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 4.19-stable tree Date: Wed, 27 Mar 2024 08:26:59 -0400 Message-ID: <20240327122700.2841531-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: 8bit The patch below does not apply to the 4.19-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 ------------------ 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/drivers/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 = locals->CompressedBufferSizeInkByte; // Output - CalculateWatermarks_params->Watermark = &s->dummy_watermark; // Watermarks *Watermark - CalculateWatermarks_params->DRAMClockChangeSupport = &mode_lib->ms.support.DRAMClockChangeSupport[0]; - CalculateWatermarks_params->MaxActiveDRAMClockChangeLatencySupported = &s->dummy_single_array[0][0]; // dml_float_t *MaxActiveDRAMClockChangeLatencySupported[] - CalculateWatermarks_params->SubViewportLinesNeededInMALL = &mode_lib->ms.SubViewportLinesNeededInMALL[j]; // dml_uint_t SubViewportLinesNeededInMALL[] - CalculateWatermarks_params->FCLKChangeSupport = &mode_lib->ms.support.FCLKChangeSupport[0]; - CalculateWatermarks_params->MaxActiveFCLKChangeLatencySupported = &s->dummy_single[0]; // dml_float_t *MaxActiveFCLKChangeLatencySupported - CalculateWatermarks_params->USRRetrainingSupport = &mode_lib->ms.support.USRRetrainingSupport[0]; + CalculateWatermarks_params->Watermark = &locals->Watermark; // Watermarks *Watermark + CalculateWatermarks_params->DRAMClockChangeSupport = &locals->DRAMClockChangeSupport; + CalculateWatermarks_params->MaxActiveDRAMClockChangeLatencySupported = locals->MaxActiveDRAMClockChangeLatencySupported; // dml_float_t *MaxActiveDRAMClockChangeLatencySupported[] + CalculateWatermarks_params->SubViewportLinesNeededInMALL = locals->SubViewportLinesNeededInMALL; // dml_uint_t SubViewportLinesNeededInMALL[] + CalculateWatermarks_params->FCLKChangeSupport = &locals->FCLKChangeSupport; + CalculateWatermarks_params->MaxActiveFCLKChangeLatencySupported = &locals->MaxActiveFCLKChangeLatencySupported; // dml_float_t *MaxActiveFCLKChangeLatencySupported + CalculateWatermarks_params->USRRetrainingSupport = &locals->USRRetrainingSupport; CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport( &mode_lib->scratch, -- 2.43.0