Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/display: early return if not in vga mode in disable_vga

The work around for hw bug causes S3 resume failure. Don't execute
disable vga logic if not in vga mode.

Signed-off-by: Eric Yang <Eric.Yang2@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Eric Yang and committed by
Alex Deucher
e18d3086 d54ee946

+10 -4
+3 -1
drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
··· 407 407 HWS_SF(, DOMAIN6_PG_STATUS, DOMAIN6_PGFSM_PWR_STATUS, mask_sh), \ 408 408 HWS_SF(, DOMAIN7_PG_STATUS, DOMAIN7_PGFSM_PWR_STATUS, mask_sh), \ 409 409 HWS_SF(, DC_IP_REQUEST_CNTL, IP_REQUEST_EN, mask_sh), \ 410 + HWS_SF(, D1VGA_CONTROL, D1VGA_MODE_ENABLE, mask_sh),\ 410 411 HWS_SF(, VGA_TEST_CONTROL, VGA_TEST_ENABLE, mask_sh),\ 411 412 HWS_SF(, VGA_TEST_CONTROL, VGA_TEST_RENDER_START, mask_sh),\ 412 413 HWS_SF(, LVTMA_PWRSEQ_CNTL, LVTMA_BLON, mask_sh), \ ··· 496 495 type DENTIST_DPPCLK_WDIVIDER; \ 497 496 type DENTIST_DISPCLK_WDIVIDER; \ 498 497 type VGA_TEST_ENABLE; \ 499 - type VGA_TEST_RENDER_START; 498 + type VGA_TEST_RENDER_START; \ 499 + type D1VGA_MODE_ENABLE; 500 500 501 501 struct dce_hwseq_shift { 502 502 HWSEQ_REG_FIELD_LIST(uint8_t)
+7 -3
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
··· 220 220 static void disable_vga( 221 221 struct dce_hwseq *hws) 222 222 { 223 + unsigned int in_vga_mode = 0; 224 + 225 + REG_GET(D1VGA_CONTROL, D1VGA_MODE_ENABLE, &in_vga_mode); 226 + 227 + if (in_vga_mode == 0) 228 + return; 229 + 223 230 REG_WRITE(D1VGA_CONTROL, 0); 224 - REG_WRITE(D2VGA_CONTROL, 0); 225 - REG_WRITE(D3VGA_CONTROL, 0); 226 - REG_WRITE(D4VGA_CONTROL, 0); 227 231 228 232 /* HW Engineer's Notes: 229 233 * During switch from vga->extended, if we set the VGA_TEST_ENABLE and