Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1c6fddb authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/display: Fix a typo in wm_min_memg_clk_in_khz 



change wm_min_memg_clk_in_khz -> wm_min_mem_clk_in_khz

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e856ec3c

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

+4 −4
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[0].wm_max_eng_clk_in_khz =

			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz - 1;

	clk_ranges.wm_clk_ranges[0].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[0].wm_min_mem_clk_in_khz =

			mem_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[0].wm_max_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz - 1;
@@ -1010,7 +1010,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;

	/* 5 GHz instead of data[7].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[1].wm_max_eng_clk_in_khz = 5000000;

	clk_ranges.wm_clk_ranges[1].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[1].wm_min_mem_clk_in_khz =

			mem_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[1].wm_max_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz - 1;
@@ -1020,7 +1020,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[2].wm_max_eng_clk_in_khz =

			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz - 1;

	clk_ranges.wm_clk_ranges[2].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[2].wm_min_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;

	/* 5 GHz instead of data[2].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[2].wm_max_mem_clk_in_khz = 5000000;
@@ -1030,7 +1030,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;

	/* 5 GHz instead of data[7].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[3].wm_max_eng_clk_in_khz = 5000000;

	clk_ranges.wm_clk_ranges[3].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[3].wm_min_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;

	/* 5 GHz instead of data[2].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[3].wm_max_mem_clk_in_khz = 5000000;

drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c

+4 −4
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[0].wm_max_eng_clk_in_khz =

			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz - 1;

	clk_ranges.wm_clk_ranges[0].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[0].wm_min_mem_clk_in_khz =

			mem_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[0].wm_max_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz - 1;
@@ -785,7 +785,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;

	/* 5 GHz instead of data[7].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[1].wm_max_eng_clk_in_khz = 5000000;

	clk_ranges.wm_clk_ranges[1].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[1].wm_min_mem_clk_in_khz =

			mem_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[1].wm_max_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz - 1;
@@ -795,7 +795,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[0].clocks_in_khz;

	clk_ranges.wm_clk_ranges[2].wm_max_eng_clk_in_khz =

			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz - 1;

	clk_ranges.wm_clk_ranges[2].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[2].wm_min_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;

	/* 5 GHz instead of data[2].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[2].wm_max_mem_clk_in_khz = 5000000;
@@ -805,7 +805,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc) 
			eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;

	/* 5 GHz instead of data[7].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[3].wm_max_eng_clk_in_khz = 5000000;

	clk_ranges.wm_clk_ranges[3].wm_min_memg_clk_in_khz =

	clk_ranges.wm_clk_ranges[3].wm_min_mem_clk_in_khz =

			mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;

	/* 5 GHz instead of data[2].clockInKHz to cover Overdrive */

	clk_ranges.wm_clk_ranges[3].wm_max_mem_clk_in_khz = 5000000;

drivers/gpu/drm/amd/display/dc/dm_services_types.h

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ struct dm_pp_clock_range_for_wm_set { 
	enum dm_pp_wm_set_id wm_set_id;

	uint32_t wm_min_eng_clk_in_khz;

	uint32_t wm_max_eng_clk_in_khz;

	uint32_t wm_min_memg_clk_in_khz;

	uint32_t wm_min_mem_clk_in_khz;

	uint32_t wm_max_mem_clk_in_khz;

};
@@ -150,7 +150,7 @@ struct dm_pp_clock_range_for_dmif_wm_set_soc15 { 
	enum dm_pp_wm_set_id wm_set_id;

	uint32_t wm_min_dcfclk_clk_in_khz;

	uint32_t wm_max_dcfclk_clk_in_khz;

	uint32_t wm_min_memg_clk_in_khz;

	uint32_t wm_min_mem_clk_in_khz;

	uint32_t wm_max_mem_clk_in_khz;

};
@@ -158,7 +158,7 @@ struct dm_pp_clock_range_for_mcif_wm_set_soc15 { 
	enum dm_pp_wm_set_id wm_set_id;

	uint32_t wm_min_socclk_clk_in_khz;

	uint32_t wm_max_socclk_clk_in_khz;

	uint32_t wm_min_memg_clk_in_khz;

	uint32_t wm_min_mem_clk_in_khz;

	uint32_t wm_max_mem_clk_in_khz;

};