leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: Revert update clk_mgr for vg

Browse Source 
This reverts commit 2208f39c75.
It caused a regression in internal FPGA tests.

Signed-off-by: Eric Bernstein <Eric.Bernstein@amd.com>
Reviewed-by: Eric Yang <eric.yang2@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Eric Bernstein
2020-11-12 16:18:48 -05:00
committed by Alex Deucher
parent 0c056b14d8
commit bc1e089476
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
View File

@@ -32,9 +32,9 @@
// For dcn20_update_clocks_update_dpp_dto // For dcn20_update_clocks_update_dpp_dto
#include "dcn20/dcn20_clk_mgr.h" #include "dcn20/dcn20_clk_mgr.h"
#include "vg_clk_mgr.h" #include "vg_clk_mgr.h"
#include "dcn301_smu.h"
#include "reg_helper.h" #include "reg_helper.h"
#include "core_types.h" #include "core_types.h"
#include "dm_helpers.h" #include "dm_helpers.h"
@@ -631,7 +631,7 @@ static unsigned int find_dcfclk_for_voltage(const struct vg_dpm_clocks *clock_ta
return 0; return 0;
} }
void vg_clk_mgr_helper_populate_bw_params( static void vg_clk_mgr_helper_populate_bw_params(
struct clk_mgr_internal *clk_mgr, struct clk_mgr_internal *clk_mgr,
struct integrated_info *bios_info, struct integrated_info *bios_info,
const struct vg_dpm_clocks *clock_table) const struct vg_dpm_clocks *clock_table)
@@ -709,7 +709,7 @@ static struct vg_dpm_clocks dummy_clocks = {
static struct watermarks dummy_wms = { 0 }; static struct watermarks dummy_wms = { 0 };
void vg_get_dpm_table_from_smu(struct clk_mgr_internal *clk_mgr, static void vg_get_dpm_table_from_smu(struct clk_mgr_internal *clk_mgr,
struct smu_dpm_clks *smu_dpm_clks) struct smu_dpm_clks *smu_dpm_clks)
{ {
struct vg_dpm_clocks *table = smu_dpm_clks->dpm_clks; struct vg_dpm_clocks *table = smu_dpm_clks->dpm_clks;

10
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h
View File

@@ -39,15 +39,5 @@ void vg_clk_mgr_construct(struct dc_context *ctx,
void vg_clk_mgr_destroy(struct clk_mgr_internal *clk_mgr); void vg_clk_mgr_destroy(struct clk_mgr_internal *clk_mgr);
#include "dcn301_smu.h"
void vg_notify_wm_ranges(struct clk_mgr *clk_mgr_base); void vg_notify_wm_ranges(struct clk_mgr *clk_mgr_base);
void vg_get_dpm_table_from_smu(struct clk_mgr_internal *clk_mgr,
struct smu_dpm_clks *smu_dpm_clks);
void vg_clk_mgr_helper_populate_bw_params(
struct clk_mgr_internal *clk_mgr,
struct integrated_info *bios_info,
const struct vg_dpm_clocks *clock_table);
#endif //__VG_CLK_MGR_H__ #endif //__VG_CLK_MGR_H__