Commit ceb9831d authored by Yongqiang Sun's avatar Yongqiang Sun Committed by Alex Deucher
Browse files

drm/amd/display: WA for DF keeps awake after S0i3. 



[Why]
DF keeps awake after S0i3 resume due to DRAM_STATE_CNTL
is set by bios command table during dcn init_hw.

[How]
As a work around, check STATE_CNTL status before init_hw,
if it is 0 before init_hw and set to 1 after init_hw,
change it to 0.

Signed-off-by: default avatarYongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e15fc81f

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

+17 −0
Original line number Diff line number Diff line
@@ -87,6 +87,23 @@ void hubbub1_wm_read_state(struct hubbub *hubbub, 
	s->dram_clk_chanage = REG_READ(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_D);

}



void hubbub1_disable_allow_self_refresh(struct hubbub *hubbub)

{

	REG_UPDATE(DCHUBBUB_ARB_DRAM_STATE_CNTL,

			DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_ENABLE, 0);

}



bool hububu1_is_allow_self_refresh_enabled(struct hubbub *hubbub)

{

	uint32_t enable = 0;



	REG_GET(DCHUBBUB_ARB_DRAM_STATE_CNTL,

			DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_ENABLE, &enable);



	return true ? false : enable;

}





bool hubbub1_verify_allow_pstate_change_high(

	struct hubbub *hubbub)

{

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h

+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,10 @@ void hubbub1_program_watermarks( 
		unsigned int refclk_mhz,

		bool safe_to_lower);



void hubbub1_disable_allow_self_refresh(struct hubbub *hubbub);



bool hububu1_is_allow_self_refresh_enabled(struct hubbub *hubub);



void hubbub1_toggle_watermark_change_req(

		struct hubbub *hubbub);

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

+14 −0
Original line number Diff line number Diff line
@@ -997,7 +997,21 @@ static void dcn10_init_hw(struct dc *dc) 
	} else {



		if (!dcb->funcs->is_accelerated_mode(dcb)) {

			bool allow_self_fresh_force_enable =

					hububu1_is_allow_self_refresh_enabled(dc->res_pool->hubbub);



			bios_golden_init(dc);



			/* WA for making DF sleep when idle after resume from S0i3.

			 * DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_ENABLE is set to 1 by

			 * command table, if DCHUBBUB_ARB_ALLOW_SELF_REFRESH_FORCE_ENABLE = 0

			 * before calling command table and it changed to 1 after,

			 * it should be set back to 0.

			 */

			if (allow_self_fresh_force_enable == false &&

					hububu1_is_allow_self_refresh_enabled(dc->res_pool->hubbub))

				hubbub1_disable_allow_self_refresh(dc->res_pool->hubbub);



			disable_vga(dc->hwseq);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE