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

Commit 458e9d03 authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: fix re-enabling stutter for raven 



We were overwriting the whole register which was re-enabling
stutter for raven. Now we are reading the register then setting
the values only for pstate.

Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f6cb588a

drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h

+4 −0
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ struct dce_hwseq_registers { 
	HWS_SF(, DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL, DCHUBBUB_ARB_WATERMARK_CHANGE_DONE_INTERRUPT_DISABLE, mask_sh), \

	HWS_SF(, DCHUBBUB_ARB_DRAM_STATE_CNTL, DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_VALUE, mask_sh), \

	HWS_SF(, DCHUBBUB_ARB_DRAM_STATE_CNTL, DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_ENABLE, mask_sh), \

	HWS_SF(, DCHUBBUB_ARB_DRAM_STATE_CNTL, DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_VALUE, mask_sh), \

	HWS_SF(, DCHUBBUB_ARB_DRAM_STATE_CNTL, DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_ENABLE, mask_sh), \

	HWS_SF(, DCHUBBUB_ARB_SAT_LEVEL, DCHUBBUB_ARB_SAT_LEVEL, mask_sh), \

	HWS_SF(, DCHUBBUB_ARB_DF_REQ_OUTSTAND, DCHUBBUB_ARB_MIN_REQ_OUTSTAND, mask_sh), \

	HWS_SF(, DCFCLK_CNTL, DCFCLK_GATE_DIS, mask_sh)
@@ -554,6 +556,8 @@ struct dce_hwseq_registers { 
	type DCHUBBUB_ARB_WATERMARK_CHANGE_DONE_INTERRUPT_DISABLE;\

	type DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_VALUE;\

	type DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_ENABLE;\

	type DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_VALUE;\

	type DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_ENABLE;\

	type DCHUBBUB_ARB_SAT_LEVEL;\

	type DCHUBBUB_ARB_MIN_REQ_OUTSTAND;\

	type OPP_PIPE_CLOCK_EN;\

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

+6 −3
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ static void verify_allow_pstate_change_high( 


	unsigned int debug_index = 0x7;

	unsigned int debug_data;

	unsigned int force_allow_pstate = 0x30;

	unsigned int i;



	if (forced_pstate_allow) {
@@ -261,7 +260,9 @@ static void verify_allow_pstate_change_high( 
		 * we verify_allow_pstate_change_high.  so disable force

		 * here so we can check status

		 */

		REG_WRITE(DCHUBBUB_ARB_DRAM_STATE_CNTL, 0);

		REG_UPDATE_2(DCHUBBUB_ARB_DRAM_STATE_CNTL,

			     DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_VALUE, 0,

			     DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_ENABLE, 0);

		forced_pstate_allow = false;

	}
@@ -304,7 +305,9 @@ static void verify_allow_pstate_change_high( 
	/* force pstate allow to prevent system hang

	 * and break to debugger to investigate

	 */

	REG_WRITE(DCHUBBUB_ARB_DRAM_STATE_CNTL, force_allow_pstate);

	REG_UPDATE_2(DCHUBBUB_ARB_DRAM_STATE_CNTL,

		     DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_VALUE, 1,

		     DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_ENABLE, 1);

	forced_pstate_allow = true;



	if (should_log_hw_state) {