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

drm/amd/display: check SR_WATERMARK regs prior to write 



Signed-off-by: default avatarEric Bernstein <eric.bernstein@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2126732f

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+74 −70
Original line number Diff line number Diff line
@@ -481,11 +481,10 @@ static void program_watermarks( 
		"HW register value = 0x%x\n",

		watermarks->a.pte_meta_urgent_ns, prog_wm_value);





	if (REG(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A)) {

		prog_wm_value = convert_and_clamp(

				watermarks->a.cstate_pstate.cstate_enter_plus_exit_ns,

				refclk_mhz, 0x1fffff);



		REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A, prog_wm_value);

		dm_logger_write(hws->ctx->logger, LOG_BANDWIDTH_CALCS,

			"SR_ENTER_EXIT_WATERMARK_A calculated =%d\n"
@@ -501,7 +500,7 @@ static void program_watermarks( 
			"SR_EXIT_WATERMARK_A calculated =%d\n"

			"HW register value = 0x%x\n",

			watermarks->a.cstate_pstate.cstate_exit_ns, prog_wm_value);



	}



	prog_wm_value = convert_and_clamp(

			watermarks->a.cstate_pstate.pstate_change_ns,
@@ -533,6 +532,7 @@ static void program_watermarks( 
		watermarks->b.pte_meta_urgent_ns, prog_wm_value);





	if (REG(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_B)) {

		prog_wm_value = convert_and_clamp(

				watermarks->b.cstate_pstate.cstate_enter_plus_exit_ns,

				refclk_mhz, 0x1fffff);
@@ -551,6 +551,7 @@ static void program_watermarks( 
			"SR_EXIT_WATERMARK_B calculated =%d\n"

			"HW register value = 0x%x\n",

			watermarks->b.cstate_pstate.cstate_exit_ns, prog_wm_value);

	}



	prog_wm_value = convert_and_clamp(

			watermarks->b.cstate_pstate.pstate_change_ns,
@@ -581,6 +582,7 @@ static void program_watermarks( 
		watermarks->c.pte_meta_urgent_ns, prog_wm_value);





	if (REG(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_C)) {

		prog_wm_value = convert_and_clamp(

				watermarks->c.cstate_pstate.cstate_enter_plus_exit_ns,

				refclk_mhz, 0x1fffff);
@@ -599,7 +601,7 @@ static void program_watermarks( 
			"SR_EXIT_WATERMARK_C calculated =%d\n"

			"HW register value = 0x%x\n",

			watermarks->c.cstate_pstate.cstate_exit_ns, prog_wm_value);



	}



	prog_wm_value = convert_and_clamp(

			watermarks->c.cstate_pstate.pstate_change_ns,
@@ -629,6 +631,7 @@ static void program_watermarks( 
		watermarks->d.pte_meta_urgent_ns, prog_wm_value);





	if (REG(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_D)) {

		prog_wm_value = convert_and_clamp(

				watermarks->d.cstate_pstate.cstate_enter_plus_exit_ns,

				refclk_mhz, 0x1fffff);
@@ -647,6 +650,7 @@ static void program_watermarks( 
			"SR_EXIT_WATERMARK_D calculated =%d\n"

			"HW register value = 0x%x\n",

			watermarks->d.cstate_pstate.cstate_exit_ns, prog_wm_value);

	}





	prog_wm_value = convert_and_clamp(