drm/amd/display: add diags clock programming

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 3e157e6..9ab69b2 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -505,3 +505,8 @@ enum dc_edid_status dm_helpers_read_local_edid(
 
        return edid_status;
 }
+
+void dm_set_dcn_clocks(struct dc_context *ctx, struct dc_clocks *clks)
+{
+       /* TODO: something */
+}

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index a6402c6..14cc4be 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -184,6 +184,17 @@ enum wm_report_mode {
        WM_REPORT_OVERRIDE = 1,
 };
 
+struct dc_clocks {
+       int dispclk_khz;
+       int max_dppclk_khz;
+       int dcfclk_khz;
+       int socclk_khz;
+       int dcfclk_deep_sleep_khz;
+       int fclk_khz;
+       int dram_ccm_us;
+       int min_active_dram_ccm_us;
+};
+
 struct dc_debug {
        bool surface_visual_confirm;
        bool sanity_checks;

diff --git a/drivers/gpu/drm/amd/display/dc/dm_helpers.h b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
index 53d5566..034369f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h
@@ -108,5 +108,8 @@ enum dc_edid_status dm_helpers_read_local_edid(
                struct dc_link *link,
                struct dc_sink *sink);
 
+void dm_set_dcn_clocks(
+               struct dc_context *ctx,
+               struct dc_clocks *clks);
 
 #endif /* __DM_HELPERS__ */

diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index a9b21a4..b8f0538 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -256,20 +256,9 @@ struct dce_bw_output {
        int blackout_recovery_time_us;
 };
 
-struct dcn_bw_clocks {
-       int dispclk_khz;
-       int max_dppclk_khz;
-       int dcfclk_khz;
-       int socclk_khz;
-       int dcfclk_deep_sleep_khz;
-       int fclk_khz;
-       int dram_ccm_us;
-       int min_active_dram_ccm_us;
-};
-
 struct dcn_bw_output {
-       struct dcn_bw_clocks cur_clk;
-       struct dcn_bw_clocks calc_clk;
+       struct dc_clocks cur_clk;
+       struct dc_clocks calc_clk;
        struct dcn_watermark_set watermarks;
 };