All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Deucher <alexander.deucher@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: Alex Deucher <alexander.deucher@amd.com>,
	Fangzhi Zuo <Jerry.Zuo@amd.com>,
	Dillon Varone <dillon.varone@amd.com>,
	Aurabindo Pillai <aurabindo.pillai@amd.com>
Subject: [PATCH 26/43] drm/amd/display: Add additional guard for FCLK pstate message for DCN321
Date: Wed, 25 May 2022 12:19:24 -0400	[thread overview]
Message-ID: <20220525161941.2544055-26-alexander.deucher@amd.com> (raw)
In-Reply-To: <20220525161941.2544055-1-alexander.deucher@amd.com>

From: Dillon Varone <dillon.varone@amd.com>

Signed-off-by: Fangzhi Zuo <Jerry.Zuo@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
index 93fbecbc8065..9d2d2cda5543 100644
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
@@ -346,8 +346,8 @@ static void dcn32_update_clocks(struct clk_mgr *clk_mgr_base,
 					clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries - 1].memclk_mhz);
 	}
 
-	if (should_update_pstate_support(safe_to_lower, fclk_p_state_change_support, clk_mgr_base->clks.fclk_p_state_change_support) &&
-			clk_mgr_base->ctx->dce_version != DCN_VERSION_3_21) {
+	if (clk_mgr_base->ctx->dce_version != DCN_VERSION_3_21 &&
+			should_update_pstate_support(safe_to_lower, fclk_p_state_change_support, clk_mgr_base->clks.fclk_p_state_change_support)) {
 		clk_mgr_base->clks.fclk_p_state_change_support = fclk_p_state_change_support;
 
 		/* To disable FCLK P-state switching, send FCLK_PSTATE_NOTSUPPORTED message to PMFW */
@@ -368,7 +368,8 @@ static void dcn32_update_clocks(struct clk_mgr *clk_mgr_base,
 			(update_uclk || !clk_mgr_base->clks.prev_p_state_change_support))
 		dcn30_smu_set_hard_min_by_freq(clk_mgr, PPCLK_UCLK, khz_to_mhz_ceil(clk_mgr_base->clks.dramclk_khz));
 
-	if (clk_mgr_base->clks.fclk_p_state_change_support &&
+	if (clk_mgr_base->ctx->dce_version != DCN_VERSION_3_21 &&
+			clk_mgr_base->clks.fclk_p_state_change_support &&
 			(update_uclk || !clk_mgr_base->clks.fclk_prev_p_state_change_support)) {
 		/* Handle the code for sending a message to PMFW that FCLK P-state change is supported */
 		dcn32_smu_send_fclk_pstate_message(clk_mgr, FCLK_PSTATE_SUPPORTED);
-- 
2.35.3


  parent reply	other threads:[~2022-05-25 16:21 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-25 16:18 [PATCH 00/43] Add support for DCN 3.2 Alex Deucher
2022-05-25 16:19 ` [PATCH 01/43] drm/amd/display: remove stale config guards Alex Deucher
2022-05-25 16:19 ` [PATCH 02/43] drm/amd: Add atomfirmware.h definitions needed for DCN32/321 Alex Deucher
2022-05-25 16:19 ` [PATCH 03/43] drm/amd/display: Add DCN32/321 version identifiers Alex Deucher
2022-05-25 16:19 ` [PATCH 05/43] drm/amd/display: Add DMCUB source files and changes for DCN32/321 Alex Deucher
2022-05-25 16:19 ` [PATCH 06/43] drm/amd/display: add dcn32 IRQ changes Alex Deucher
2022-05-25 16:19 ` [PATCH 07/43] drm/amd/display: add GPIO changes for DCN32/321 Alex Deucher
2022-05-25 16:19 ` [PATCH 08/43] drm/amd/display: DML " Alex Deucher
2022-05-25 16:19 ` [PATCH 09/43] drm/amd/display: add CLKMGR " Alex Deucher
2022-05-25 16:19 ` [PATCH 10/43] drm/amd/display: add DCN32/321 specific files for Display Core Alex Deucher
2022-05-25 16:19 ` [PATCH 11/43] drm/amd/display: Add dependant changes for DCN32/321 Alex Deucher
2022-05-25 16:19 ` [PATCH 12/43] drm/amd/display: Add DM support for DCN32/DCN321 Alex Deucher
2022-05-25 16:19 ` [PATCH 13/43] drm/amd/display: add DCN32 to IP discovery table Alex Deucher
2022-05-25 16:19 ` [PATCH 14/43] drm/amd: Add GFX11 modifiers support to AMDGPU Alex Deucher
2022-05-25 19:27   ` Marek Olšák
2022-05-25 16:19 ` [PATCH 15/43] drm/amd/display: Fix USBC link creation Alex Deucher
2022-05-25 16:19 ` [PATCH 16/43] drm/amd/display: Add missing instance for clock source register Alex Deucher
2022-05-25 16:19 ` [PATCH 17/43] drm/amd/display: Use DTBCLK for valid pixel clock Alex Deucher
2022-05-25 16:19 ` [PATCH 18/43] drm/amd/display: Add guard for FCLK pstate message to PMFW for DCN321 Alex Deucher
2022-05-25 16:19 ` [PATCH 19/43] drm/amd/display: Various DML fixes to enable higher timings Alex Deucher
2022-05-25 16:19 ` [PATCH 20/43] drm/amd/display: Implement WM table transfer for DCN32/DCN321 Alex Deucher
2022-05-25 16:19 ` [PATCH 21/43] drm/amd/display: add missing interrupt handlers " Alex Deucher
2022-05-25 16:19 ` [PATCH 22/43] drm/amd/display: disable idle optimizations Alex Deucher
2022-05-25 16:19 ` [PATCH 23/43] drm/amd/display: Select correct DTO source Alex Deucher
2022-05-25 16:19 ` [PATCH 24/43] drm/amd/display: use updated clock source init routine Alex Deucher
2022-05-25 16:19 ` [PATCH 25/43] drm/amd/display: Ensure that DMCUB fw in use is loaded by DC and not VBIOS Alex Deucher
2022-05-25 16:19 ` Alex Deucher [this message]
2022-05-25 16:19 ` [PATCH 27/43] drm/amd/display: Halve DTB Clock Value for DCN32 Alex Deucher
2022-05-25 16:19 ` [PATCH 28/43] drm/amd/display: set dram speed for all states Alex Deucher
2022-05-25 16:19 ` [PATCH 29/43] drm/amd/display: Disable DTB Ref Clock Switching in dcn32 Alex Deucher
2022-05-25 16:19 ` [PATCH 30/43] drm/amd/display: change dsc image width cap for dcn32 and dcn321 Alex Deucher
2022-05-25 16:19 ` [PATCH 31/43] drm/amd/display: do not override CURSOR_REQ_MODE when SubVP is not enabled Alex Deucher
2022-05-25 16:19 ` [PATCH 32/43] drm/amd/display: Remove W/A for ODM memory pins Alex Deucher
2022-05-25 16:19 ` [PATCH 33/43] drm/amd/display: add new pixel rate programming Alex Deucher
2022-05-25 16:19 ` [PATCH 34/43] drm/amd/display: set link fec status during init for DCN32 Alex Deucher
2022-05-25 16:19 ` [PATCH 35/43] drm/amd/display: update disp pattern generator routine for DCN30 Alex Deucher
2022-05-25 16:19 ` [PATCH 36/43] drm/amd/display: cleaning up smu_if to add future flexibility Alex Deucher
2022-05-25 16:19 ` [PATCH 37/43] drm/amd/display: Match dprefclk with clk registers Alex Deucher
2022-05-25 16:19 ` [PATCH 38/43] drm/amd/display: Introduce new update_clocks logic Alex Deucher
2022-05-25 16:19 ` [PATCH 39/43] drm/amd/display: FCLK P-state support updates Alex Deucher
2022-05-25 16:19 ` [PATCH 40/43] drm/amd/display: Updates for OTG and DCCG clocks Alex Deucher
2022-05-25 16:19 ` [PATCH 41/43] drm/amd/display: Implement DTBCLK ref switching on dcn32 Alex Deucher
2022-05-25 16:19 ` [PATCH 42/43] drm/amd/display: Add ODM seamless boot support Alex Deucher
2022-05-25 16:19 ` [PATCH 43/43] drm/amd/display: Drop unnecessary guard from DC resource Alex Deucher

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=20220525161941.2544055-26-alexander.deucher@amd.com \
    --to=alexander.deucher@amd.com \
    --cc=Jerry.Zuo@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=aurabindo.pillai@amd.com \
    --cc=dillon.varone@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.