]> git.ipfire.org Git - thirdparty/linux.git/commit
drm/amd/display: Check for S0i3 to be done before DCCG init on DCN21
authorIvan Lipski <ivan.lipski@amd.com>
Thu, 26 Feb 2026 02:48:36 +0000 (21:48 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 11 Mar 2026 17:56:57 +0000 (13:56 -0400)
commitc61eda434336cf2c033aa35efdc9a08b31d2fdfa
tree00b66939a4c6a28e91701cb325725773e695fc9c
parentb8469dd5b37fd25886c2018a04b71eb76fe8975d
drm/amd/display: Check for S0i3 to be done before DCCG init on DCN21

[WHY]
On DCN21, dccg2_init() is called in dcn10_init_hw() before
bios_golden_init(). During S0i3 resume, BIOS sets MICROSECOND_TIME_BASE_DIV
to 0x00120464 as a marker. dccg2_init() overwrites this to 0x00120264,
causing dcn21_s0i3_golden_init_wa() to misdetect the state and skip golden
init.
Eventually during the resume sequence, a flip timeout occurs.

[HOW]
Skip DCCG on dccg2_is_s0i3_golden_init_wa_done() on DCN21.

Fixes: 4c595e75110e ("drm/amd/display: Migrate DCCG registers access from hwseq to dccg component.")
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Ivan Lipski <ivan.lipski@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c