From: Dave Airlie <[email protected]>

The DP compliance test pattern workaround in
dm_helpers_dp_handle_test_pattern_request() reached into the clock
manager (dc_get_clk_mgr) to read the softmax memory clock limits and
to invoke the clock update. Move the whole sequence into DC as
dc_force_max_dramclk() and drop the dc_get_clk_mgr accessor; no code
outside DC references struct clk_mgr anymore.

Part of making the struct dc sub-structures opaque outside DC.

Signed-off-by: Dave Airlie <[email protected]>
---
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  | 10 +---------
 .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c  |  1 -
 drivers/gpu/drm/amd/display/dc/core/dc.c           | 23 ++++++++++++++++++++++
 drivers/gpu/drm/amd/display/dc/core/dc_accessors.c |  5 -----
 drivers/gpu/drm/amd/display/dc/inc/dc.h            |  8 ++++++--
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index b5b3269f3d97..542f9c4cb7e4 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -1559,7 +1559,6 @@ bool dm_helpers_dp_handle_test_pattern_request(
        struct amdgpu_dm_connector *aconnector = link->priv;
        struct drm_device *dev = aconnector->base.dev;
        struct dc_state *dc_state = dc_get_current_state(ctx->dc);
-       struct clk_mgr *clk_mgr = dc_get_clk_mgr(ctx->dc);
        int i;
 
        for (i = 0; i < MAX_PIPES; i++) {
@@ -1661,14 +1660,7 @@ bool dm_helpers_dp_handle_test_pattern_request(
        pipe_ctx->stream->test_pattern.color_space = test_pattern_color_space;
 
        /* Temp W/A for compliance test failure */
-       dc_state->bw_ctx.bw.dcn.clk.p_state_change_support = false;
-       dc_state->bw_ctx.bw.dcn.clk.dramclk_khz = 
clk_mgr->dc_mode_softmax_enabled ?
-               clk_mgr->bw_params->dc_mode_softmax_memclk : 
clk_mgr->bw_params->max_memclk_mhz;
-       dc_state->bw_ctx.bw.dcn.clk.idle_dramclk_khz = 
dc_state->bw_ctx.bw.dcn.clk.dramclk_khz;
-       dc_get_clk_mgr(ctx->dc)->funcs->update_clocks(
-                       dc_get_clk_mgr(ctx->dc),
-                       dc_state,
-                       false);
+       dc_force_max_dramclk(ctx->dc, dc_state);
 
        dc_link_dp_set_test_pattern(
                (struct dc_link *) link,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c
index c4f703980d1e..4543b0b0f993 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c
@@ -732,7 +732,6 @@ static void dm_test_idle_worker_enabled_runs_body(struct 
kunit *test)
        dc_get_ctx(adev->dm.dc)->logger = logger;
        /* dc_allow() only flips the flag when clk_mgr and apply() are present. 
*/
        dc_test_set_clk_mgr(adev->dm.dc, dm_kunit_alloc_clk_mgr(test));
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dc_get_clk_mgr(adev->dm.dc));
        dc_test_hwss(adev->dm.dc)->apply_idle_power_optimizations = 
dm_test_idle_apply_flip;
 
        idle_work = kunit_kzalloc(test, sizeof(*idle_work), GFP_KERNEL);
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c 
b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 8344d821d2e8..15379b186a91 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -7357,6 +7357,29 @@ void dc_set_edp_power(const struct dc *dc, struct 
dc_link *edp_link,
        edp_link->dc->link_srv->edp_set_panel_power(edp_link, powerOn);
 }
 
+/**
+ * dc_force_max_dramclk() - raise the memory clock for DP compliance tests
+ * @dc: Current DC state
+ * @context: The state whose clocks are programmed
+ *
+ * Temporary workaround for DP compliance test failures: disallow p-state
+ * switching for the given state, raise the memory clock to the maximum
+ * supported level and apply the resulting clocks immediately.
+ */
+void dc_force_max_dramclk(struct dc *dc, struct dc_state *context)
+{
+       context->bw_ctx.bw.dcn.clk.p_state_change_support = false;
+       context->bw_ctx.bw.dcn.clk.dramclk_khz =
+                       dc->clk_mgr->dc_mode_softmax_enabled ?
+                       dc->clk_mgr->bw_params->dc_mode_softmax_memclk :
+                       dc->clk_mgr->bw_params->max_memclk_mhz;
+       context->bw_ctx.bw.dcn.clk.idle_dramclk_khz =
+                       context->bw_ctx.bw.dcn.clk.dramclk_khz;
+
+       if (dc->clk_mgr && dc->clk_mgr->funcs->update_clocks)
+               dc->clk_mgr->funcs->update_clocks(dc->clk_mgr, context, false);
+}
+
 /**
  * dc_get_power_profile_for_dc_state() - extracts power profile from dc state
  *
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c 
b/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c
index 23aced5d5eef..9e8dffadfaec 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c
@@ -94,11 +94,6 @@ struct resource_pool *dc_get_res_pool(const struct dc *dc)
 }
 EXPORT_IF_KUNIT(dc_get_res_pool);
 
-struct clk_mgr *dc_get_clk_mgr(struct dc *dc)
-{
-       return dc->clk_mgr;
-}
-EXPORT_IF_KUNIT(dc_get_clk_mgr);
 
 bool dc_get_dcc_compression_cap(const struct dc *dc,
                const struct dc_dcc_surface_param *input,
diff --git a/drivers/gpu/drm/amd/display/dc/inc/dc.h 
b/drivers/gpu/drm/amd/display/dc/inc/dc.h
index d20180a449d5..1cb97c7b6c16 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/dc.h
@@ -2382,8 +2382,12 @@ bool dc_is_idle_optimizations_allowed(const struct dc 
*dc);
  */
 struct resource_pool *dc_get_res_pool(const struct dc *dc);
 
-/* The clock manager. Interim accessor. */
-struct clk_mgr *dc_get_clk_mgr(struct dc *dc);
+/*
+ * Temporary workaround for DP compliance test failures: disallow p-state
+ * switching for the given state, raise the memory clock to the maximum
+ * supported level and apply the resulting clocks immediately.
+ */
+void dc_force_max_dramclk(struct dc *dc, struct dc_state *context);
 
 /*
  * Query DCC compression support for a surface.

-- 
2.56.0


Reply via email to