Commit 01130f52 authored by Aric Cyr's avatar Aric Cyr Committed by Alex Deucher
Browse files

drm/amd/display: Add hubp cache reset when powergating 



[Why]
When HUBP is power gated, the SW state can get out of sync with the
hardware state causing cursor to not be programmed correctly.

[How]
Similar to DPP, add a HUBP reset function which is called wherever
HUBP is initialized or powergated.  This function will clear the cursor
position and attribute cache allowing for proper programming when the
HUBP is brought back up.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarSung Lee <sung.lee@amd.com>
Signed-off-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 335acfb6

drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.c

+3 −0
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ void dpp_reset(struct dpp *dpp_base) 
	dpp->filter_h = NULL;

	dpp->filter_v = NULL;



	memset(&dpp_base->pos, 0, sizeof(dpp_base->pos));

	memset(&dpp_base->att, 0, sizeof(dpp_base->att));



	memset(&dpp->scl_data, 0, sizeof(dpp->scl_data));

	memset(&dpp->pwl_data, 0, sizeof(dpp->pwl_data));

}

drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c

+9 −1
Original line number Diff line number Diff line
@@ -546,6 +546,12 @@ void hubp1_dcc_control(struct hubp *hubp, bool enable, 
			SECONDARY_SURFACE_DCC_IND_64B_BLK, dcc_ind_64b_blk);

}



void hubp_reset(struct hubp *hubp)

{

	memset(&hubp->pos, 0, sizeof(hubp->pos));

	memset(&hubp->att, 0, sizeof(hubp->att));

}



void hubp1_program_surface_config(

	struct hubp *hubp,

	enum surface_pixel_format format,
@@ -1351,8 +1357,9 @@ static void hubp1_wait_pipe_read_start(struct hubp *hubp) 


void hubp1_init(struct hubp *hubp)

{

	//do nothing

	hubp_reset(hubp);

}



static const struct hubp_funcs dcn10_hubp_funcs = {

	.hubp_program_surface_flip_and_addr =

			hubp1_program_surface_flip_and_addr,
@@ -1365,6 +1372,7 @@ static const struct hubp_funcs dcn10_hubp_funcs = { 
	.hubp_set_vm_context0_settings = hubp1_set_vm_context0_settings,

	.set_blank = hubp1_set_blank,

	.dcc_control = hubp1_dcc_control,

	.hubp_reset = hubp_reset,

	.mem_program_viewport = min_set_viewport,

	.set_hubp_blank_en = hubp1_set_hubp_blank_en,

	.set_cursor_attributes	= hubp1_cursor_set_attributes,

drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h

+2 −0
Original line number Diff line number Diff line
@@ -746,6 +746,8 @@ void hubp1_dcc_control(struct hubp *hubp, 
		bool enable,

		enum hubp_ind_block_size independent_64b_blks);



void hubp_reset(struct hubp *hubp);



bool hubp1_program_surface_flip_and_addr(

	struct hubp *hubp,

	const struct dc_plane_address *address,

drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c

+1 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,7 @@ static struct hubp_funcs dcn20_hubp_funcs = { 
	.set_blank = hubp2_set_blank,

	.set_blank_regs = hubp2_set_blank_regs,

	.dcc_control = hubp2_dcc_control,

	.hubp_reset = hubp_reset,

	.mem_program_viewport = min_set_viewport,

	.set_cursor_attributes	= hubp2_cursor_set_attributes,

	.set_cursor_position	= hubp2_cursor_set_position,

drivers/gpu/drm/amd/display/dc/hubp/dcn201/dcn201_hubp.c

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static struct hubp_funcs dcn201_hubp_funcs = { 
	.set_cursor_position	= hubp1_cursor_set_position,

	.set_blank = hubp1_set_blank,

	.dcc_control = hubp1_dcc_control,

	.hubp_reset = hubp_reset,

	.mem_program_viewport = min_set_viewport,

	.hubp_clk_cntl = hubp1_clk_cntl,

	.hubp_vtg_sel = hubp1_vtg_sel,