Commit 132dade1 authored by Ilya Bakoulin's avatar Ilya Bakoulin Committed by Alex Deucher
Browse files

drm/amd/display: Fix HUBP secondary viewport programming 



[Why]
Secondary viewport dimension/position registers are not programmed,
which can cause issues in some stereo configurations.

[How]
Add register definitions and register programming.

Signed-off-by: default avatarIlya Bakoulin <Ilya.Bakoulin@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent de7b45ba

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

+8 −0
Original line number Diff line number Diff line
@@ -841,6 +841,14 @@ void min_set_viewport( 
	REG_SET_2(DCSURF_PRI_VIEWPORT_START_C, 0,

		  PRI_VIEWPORT_X_START_C, viewport_c->x,

		  PRI_VIEWPORT_Y_START_C, viewport_c->y);



	REG_SET_2(DCSURF_SEC_VIEWPORT_DIMENSION_C, 0,

		  SEC_VIEWPORT_WIDTH_C, viewport_c->width,

		  SEC_VIEWPORT_HEIGHT_C, viewport_c->height);



	REG_SET_2(DCSURF_SEC_VIEWPORT_START_C, 0,

		  SEC_VIEWPORT_X_START_C, viewport_c->x,

		  SEC_VIEWPORT_Y_START_C, viewport_c->y);

}



void hubp1_read_state_common(struct hubp *hubp)

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

+12 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
	SRI(DCSURF_SEC_VIEWPORT_START, HUBP, id), \

	SRI(DCSURF_PRI_VIEWPORT_DIMENSION_C, HUBP, id), \

	SRI(DCSURF_PRI_VIEWPORT_START_C, HUBP, id), \

	SRI(DCSURF_SEC_VIEWPORT_DIMENSION_C, HUBP, id), \

	SRI(DCSURF_SEC_VIEWPORT_START_C, HUBP, id), \

	SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\

	SRI(DCSURF_PRIMARY_SURFACE_ADDRESS, HUBPREQ, id),\

	SRI(DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, HUBPREQ, id),\
@@ -154,6 +156,8 @@ 
	uint32_t DCSURF_SEC_VIEWPORT_START; \

	uint32_t DCSURF_PRI_VIEWPORT_DIMENSION_C; \

	uint32_t DCSURF_PRI_VIEWPORT_START_C; \

	uint32_t DCSURF_SEC_VIEWPORT_DIMENSION_C; \

	uint32_t DCSURF_SEC_VIEWPORT_START_C; \

	uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH; \

	uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS; \

	uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH; \
@@ -287,6 +291,10 @@ 
	HUBP_SF(HUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_C, PRI_VIEWPORT_HEIGHT_C, mask_sh),\

	HUBP_SF(HUBP0_DCSURF_PRI_VIEWPORT_START_C, PRI_VIEWPORT_X_START_C, mask_sh),\

	HUBP_SF(HUBP0_DCSURF_PRI_VIEWPORT_START_C, PRI_VIEWPORT_Y_START_C, mask_sh),\

	HUBP_SF(HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION_C, SEC_VIEWPORT_WIDTH_C, mask_sh),\

	HUBP_SF(HUBP0_DCSURF_SEC_VIEWPORT_DIMENSION_C, SEC_VIEWPORT_HEIGHT_C, mask_sh),\

	HUBP_SF(HUBP0_DCSURF_SEC_VIEWPORT_START_C, SEC_VIEWPORT_X_START_C, mask_sh),\

	HUBP_SF(HUBP0_DCSURF_SEC_VIEWPORT_START_C, SEC_VIEWPORT_Y_START_C, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH, PRIMARY_SURFACE_ADDRESS_HIGH, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS, PRIMARY_SURFACE_ADDRESS, mask_sh),\

	HUBP_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH, SECONDARY_SURFACE_ADDRESS_HIGH, mask_sh),\
@@ -481,6 +489,10 @@ 
	type PRI_VIEWPORT_HEIGHT_C; \

	type PRI_VIEWPORT_X_START_C; \

	type PRI_VIEWPORT_Y_START_C; \

	type SEC_VIEWPORT_WIDTH_C; \

	type SEC_VIEWPORT_HEIGHT_C; \

	type SEC_VIEWPORT_X_START_C; \

	type SEC_VIEWPORT_Y_START_C; \

	type PRIMARY_SURFACE_ADDRESS_HIGH;\

	type PRIMARY_SURFACE_ADDRESS;\

	type SECONDARY_SURFACE_ADDRESS_HIGH;\

CRA Git | Maintained and supported by SUSTech CRA and CCSE