From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ayush Gupta <ayugupta@amd.com>, Alvin Lee <Alvin.Lee2@amd.com>,
Martin Leung <Martin.Leung@amd.com>,
Qingqing Zhuo <qingqing.zhuo@amd.com>,
Daniel Wheeler <daniel.wheeler@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
harry.wentland@amd.com, sunpeng.li@amd.com,
Rodrigo.Siqueira@amd.com, christian.koenig@amd.com,
Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch,
Jun.Lei@amd.com, wenjing.liu@amd.com, Wesley.Chalmers@amd.com,
aric.cyr@amd.com, mwen@igalia.com, felipe.clark@amd.com,
sungjoon.kim@amd.com, aurabindo.pillai@amd.com,
Charlene.Liu@amd.com, Jimmy.Kizito@amd.com, duncan.ma@amd.com,
Brian.Chang@amd.com, Dillon.Varone@amd.com, Syed.Hassan@amd.com,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 6.1 19/33] drm/amd/display: fixed dcn30+ underflow issue
Date: Sun, 30 Apr 2023 23:02:13 -0400 [thread overview]
Message-ID: <20230501030227.3254266-19-sashal@kernel.org> (raw)
In-Reply-To: <20230501030227.3254266-1-sashal@kernel.org>
From: Ayush Gupta <ayugupta@amd.com>
[ Upstream commit 37403ced9f2873fab7f39ab4ac963bbb33fb0bc0 ]
[Why]
Observing underflow on dcn30+ system config at 4k144hz
[How]
We set the UCLK hardmax on AC/DC switch if softmax is enabled
and also on boot. While booting up the UCLK Hardmax is set
to softmax before the init sequence and the init sequence
resets the hardmax to UCLK max which enables P-state switching.
Just added a conditional check to avoid setting hardmax on init.
Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
Reviewed-by: Martin Leung <Martin.Leung@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Ayush Gupta <ayugupta@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 ++-
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 2 +-
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
index c20e9f76f0213..a1b312483d7f1 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
@@ -629,7 +629,8 @@ void dcn30_init_hw(struct dc *dc)
if (dc->clk_mgr->funcs->notify_wm_ranges)
dc->clk_mgr->funcs->notify_wm_ranges(dc->clk_mgr);
- if (dc->clk_mgr->funcs->set_hard_max_memclk)
+ //if softmax is enabled then hardmax will be set by a different call
+ if (dc->clk_mgr->funcs->set_hard_max_memclk && !dc->clk_mgr->dc_mode_softmax_enabled)
dc->clk_mgr->funcs->set_hard_max_memclk(dc->clk_mgr);
if (dc->res_pool->hubbub->funcs->force_pstate_change_control)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
index bdf101547484a..d4ee533deff32 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
@@ -284,7 +284,7 @@ void dcn31_init_hw(struct dc *dc)
if (dc->clk_mgr->funcs->notify_wm_ranges)
dc->clk_mgr->funcs->notify_wm_ranges(dc->clk_mgr);
- if (dc->clk_mgr->funcs->set_hard_max_memclk)
+ if (dc->clk_mgr->funcs->set_hard_max_memclk && !dc->clk_mgr->dc_mode_softmax_enabled)
dc->clk_mgr->funcs->set_hard_max_memclk(dc->clk_mgr);
if (dc->res_pool->hubbub->funcs->force_pstate_change_control)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
index 1a85509c12f23..a32e21ada8555 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
@@ -970,7 +970,7 @@ void dcn32_init_hw(struct dc *dc)
if (dc->clk_mgr->funcs->notify_wm_ranges)
dc->clk_mgr->funcs->notify_wm_ranges(dc->clk_mgr);
- if (dc->clk_mgr->funcs->set_hard_max_memclk)
+ if (dc->clk_mgr->funcs->set_hard_max_memclk && !dc->clk_mgr->dc_mode_softmax_enabled)
dc->clk_mgr->funcs->set_hard_max_memclk(dc->clk_mgr);
if (dc->res_pool->hubbub->funcs->force_pstate_change_control)
--
2.39.2
next prev parent reply other threads:[~2023-05-01 3:12 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-01 3:01 [PATCH AUTOSEL 6.1 01/33] drm/displayid: add displayid_get_header() and check bounds better Sasha Levin
2023-05-01 3:01 ` [PATCH AUTOSEL 6.1 02/33] drm/amd/display: populate subvp cmd info only for the top pipe Sasha Levin
2023-05-01 3:01 ` [PATCH AUTOSEL 6.1 03/33] drm/amd/display: Correct DML calculation to align HW formula Sasha Levin
2023-05-01 3:01 ` [PATCH AUTOSEL 6.1 04/33] platform/x86: x86-android-tablets: Add Acer Iconia One 7 B1-750 data Sasha Levin
2023-05-01 3:01 ` [PATCH AUTOSEL 6.1 05/33] drm/amd/display: Enable HostVM based on rIOMMU active Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 06/33] drm/amd/display: Use DC_LOG_DC in the trasform pixel function Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 07/33] regmap: cache: Return error in cache sync operations for REGCACHE_NONE Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 08/33] remoteproc: imx_dsp_rproc: Add custom memory copy implementation for i.MX DSP Cores Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 09/33] arm64: dts: qcom: msm8996: Add missing DWC3 quirks Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 10/33] media: cx23885: Fix a null-ptr-deref bug in buffer_prepare() and buffer_finish() Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 11/33] media: pci: tw68: Fix null-ptr-deref bug in buf prepare and finish Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 12/33] media: pvrusb2: VIDEO_PVRUSB2 depends on DVB_CORE to use dvb_* symbols Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 13/33] ACPI: processor: Check for null return of devm_kzalloc() in fch_misc_setup() Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 14/33] drm/rockchip: dw_hdmi: cleanup drm encoder during unbind Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 15/33] memstick: r592: Fix UAF bug in r592_remove due to race condition Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 16/33] arm64: dts: imx8mq-librem5: Remove dis_u3_susphy_quirk from usb_dwc3_0 Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 17/33] firmware: arm_sdei: Fix sleep from invalid context BUG Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 18/33] ACPI: EC: Fix oops when removing custom query handlers Sasha Levin
2023-05-01 3:02 ` Sasha Levin [this message]
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 20/33] remoteproc: stm32_rproc: Add mutex protection for workqueue Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 21/33] drm/tegra: Avoid potential 32-bit integer overflow Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 22/33] drm/msm/dp: Clean up handling of DP AUX interrupts Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 23/33] ACPICA: Avoid undefined behavior: applying zero offset to null pointer Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 24/33] ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 25/33] arm64: dts: qcom: sdm845-polaris: Drop inexistent properties Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 26/33] irqchip/gicv3: Workaround for NVIDIA erratum T241-FABRIC-4 Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 27/33] media: cros-ec-cec: Don't exit early in .remove() callback Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 28/33] ACPI: video: Remove desktops without backlight DMI quirks Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 29/33] drm/amd/display: Correct DML calculation to follow HW SPEC Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 30/33] drm/amd: Fix an out of bounds error in BIOS parser Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 31/33] drm/amdgpu: Fix sdma v4 sw fini error Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 32/33] media: Prefer designated initializers over memset for subdev pad ops Sasha Levin
2023-05-01 3:02 ` [PATCH AUTOSEL 6.1 33/33] media: mediatek: vcodec: Fix potential array out-of-bounds in decoder queue_setup Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230501030227.3254266-19-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Alvin.Lee2@amd.com \
--cc=Brian.Chang@amd.com \
--cc=Charlene.Liu@amd.com \
--cc=Dillon.Varone@amd.com \
--cc=Jimmy.Kizito@amd.com \
--cc=Jun.Lei@amd.com \
--cc=Martin.Leung@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Syed.Hassan@amd.com \
--cc=Wesley.Chalmers@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=aric.cyr@amd.com \
--cc=aurabindo.pillai@amd.com \
--cc=ayugupta@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel.wheeler@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=duncan.ma@amd.com \
--cc=felipe.clark@amd.com \
--cc=harry.wentland@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mwen@igalia.com \
--cc=qingqing.zhuo@amd.com \
--cc=stable@vger.kernel.org \
--cc=sungjoon.kim@amd.com \
--cc=sunpeng.li@amd.com \
--cc=wenjing.liu@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).