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

Commit 39f26499 authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher
Browse files

drm/amd/display: Put dcn_mi_registers with other structs 



Signed-off-by: default avatarEric Bernstein <eric.bernstein@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4b8240bf

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

+5 −9
Original line number Diff line number Diff line
@@ -230,12 +230,7 @@ 
	uint32_t CURSOR_CONTROL; \

	uint32_t CURSOR_POSITION; \

	uint32_t CURSOR_HOT_SPOT; \

	uint32_t CURSOR_DST_OFFSET;





struct dcn_mi_registers {

	HUBP_COMMON_REG_VARIABLE_LIST

};

	uint32_t CURSOR_DST_OFFSET



#define HUBP_SF(reg_name, field_name, post_fix)\

	.field_name = reg_name ## __ ## field_name ## post_fix
@@ -399,9 +394,6 @@ struct dcn_mi_registers { 
	HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \

	HUBP_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh)









#define DCN_HUBP_REG_FIELD_LIST(type) \

	type HUBP_BLANK_EN;\

	type HUBP_TTU_DISABLE;\
@@ -581,6 +573,10 @@ struct dcn_mi_registers { 
	type CURSOR_DST_X_OFFSET; \

	type OUTPUT_FP



struct dcn_mi_registers {

	HUBP_COMMON_REG_VARIABLE_LIST;

};



struct dcn_mi_shift {

	DCN_HUBP_REG_FIELD_LIST(uint8_t);

};

drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ enum cursor_lines_per_chunk { 
	CURSOR_LINE_PER_CHUNK_16

};





struct hubp {

	struct hubp_funcs *funcs;

	struct dc_context *ctx;