Commit bc1e0894 authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher
Browse files

drm/amd/display: Revert update clk_mgr for vg 



This reverts commit 2208f39c.
It caused a regression in internal FPGA tests.

Signed-off-by: default avatarEric Bernstein <Eric.Bernstein@amd.com>
Reviewed-by: default avatarEric Yang <eric.yang2@amd.com>
Acked-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0c056b14

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

+4 −4
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
// For dcn20_update_clocks_update_dpp_dto

#include "dcn20/dcn20_clk_mgr.h"







#include "vg_clk_mgr.h"



#include "dcn301_smu.h"

#include "reg_helper.h"

#include "core_types.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;

}



void vg_clk_mgr_helper_populate_bw_params(

static 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)
@@ -709,7 +709,7 @@ static struct vg_dpm_clocks dummy_clocks = { 


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 vg_dpm_clocks *table = smu_dpm_clks->dpm_clks;

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

+0 −10
Original line number Diff line number Diff line
@@ -39,15 +39,5 @@ void vg_clk_mgr_construct(struct dc_context *ctx, 


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_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__