Commit 4f43d753 authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files

drm/amd/display: Correct z8 watermark mask 



Correct z8_watermark mask from 16bit to 20bit. Also, do not set dcn35
dprefclk in clk_mgr_construct.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarMuhammad Ahmed <ahmed.ahmed@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 990d9888

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c

+0 −2
Original line number Diff line number Diff line
@@ -930,8 +930,6 @@ void dcn35_clk_mgr_construct( 
	/*when clk src is from FCH, it could have ss, same clock src as DPREF clk*/



	dcn35_read_ss_info_from_lut(&clk_mgr->base);

	clk_mgr->base.base.dprefclk_khz =

		dce_adjust_dp_ref_freq_for_ss(&clk_mgr->base, clk_mgr->base.base.dprefclk_khz);



	clk_mgr->base.base.bw_params = &dcn35_bw_params;

drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c

+8 −8
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->a.cstate_pstate.cstate_enter_plus_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->a.cstate_pstate.cstate_enter_plus_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_A, 0,

				DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_A, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_A calculated =%d\n"
@@ -140,7 +140,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->a.cstate_pstate.cstate_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->a.cstate_pstate.cstate_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_A, 0,

				DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_A, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_A calculated =%d\n"
@@ -158,7 +158,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->b.cstate_pstate.cstate_enter_plus_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->b.cstate_pstate.cstate_enter_plus_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_B, 0,

				DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_B, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_B calculated =%d\n"
@@ -174,7 +174,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->b.cstate_pstate.cstate_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->b.cstate_pstate.cstate_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_B, 0,

				DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_B, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_B calculated =%d\n"
@@ -191,7 +191,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->c.cstate_pstate.cstate_enter_plus_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->c.cstate_pstate.cstate_enter_plus_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_C, 0,

				DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_C, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_C calculated =%d\n"
@@ -207,7 +207,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->c.cstate_pstate.cstate_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->c.cstate_pstate.cstate_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_C, 0,

				DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_C, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_C calculated =%d\n"
@@ -224,7 +224,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->d.cstate_pstate.cstate_enter_plus_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->d.cstate_pstate.cstate_enter_plus_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_D, 0,

				DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_D, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_D calculated =%d\n"
@@ -240,7 +240,7 @@ static bool hubbub35_program_stutter_z8_watermarks( 
				watermarks->d.cstate_pstate.cstate_exit_z8_ns;

		prog_wm_value = convert_and_clamp(

				watermarks->d.cstate_pstate.cstate_exit_z8_ns,

				refclk_mhz, 0xffff);

				refclk_mhz, 0xfffff);

		REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_D, 0,

				DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_D, prog_wm_value);

		DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_D calculated =%d\n"