drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X

Bing Guo · smb49 · commit f88dde7876aa · 2021-09-24T12:27:44.000+02:00
BugLink: https://bugs.launchpad.net/bugs/1944212 [ Upstream commit 06050a0 ] Why: In DCN2x, HW doesn't automatically divide MASTER_UPDATE_LOCK_DB_X by the number of pipes ODM Combined. How: Set MASTER_UPDATE_LOCK_DB_X to the value that is adjusted by the number of pipes ODM Combined. Reviewed-by: Martin Leung <martin.leung@amd.com> Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Bing Guo <bing.guo@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c
@@ -362,7 +362,7 @@ void optc2_lock_doublebuffer_enable(struct timing_generator *optc)
 
 	REG_UPDATE_2(OTG_GLOBAL_CONTROL1,
 			MASTER_UPDATE_LOCK_DB_X,
-			h_blank_start - 200 - 1,
+			(h_blank_start - 200 - 1) / optc1->opp_count,
 			MASTER_UPDATE_LOCK_DB_Y,
 			v_blank_start - 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ void optc2_lock_doublebuffer_enable(struct timing_generator *optc)`
`362`	`362`
`363`	`363`	`REG_UPDATE_2(OTG_GLOBAL_CONTROL1,`
`364`	`364`	`MASTER_UPDATE_LOCK_DB_X,`
`365`		`- h_blank_start - 200 - 1,`
	`365`	`+ (h_blank_start - 200 - 1) / optc1->opp_count,`
`366`	`366`	`MASTER_UPDATE_LOCK_DB_Y,`
`367`	`367`	`v_blank_start - 1);`
`368`	`368`	`}`