]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amd/display: trigger timing sync only if TG is running
authorAurabindo Pillai <aurabindo.pillai@amd.com>
Mon, 21 Nov 2022 20:48:23 +0000 (15:48 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 6 Dec 2022 15:13:31 +0000 (10:13 -0500)
[Why&How]
If the timing generator isnt running, it does not make sense to trigger
a sync on the corresponding OTG. Check this condition before starting.
Otherwise, this will cause error like:

*ERROR* GSL: Timeout on reset trigger!

Fixes: dc55b106ad477c ("drm/amd/display: Disable phantom OTG after enable for plane disable")
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
Acked-by: Stylon Wang <stylon.wang@amd.com>
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

index 355ffed7380bdc8e40601a4f9f24b980719c2644..c8ec11839b4d17354fe2800edf38184be89ac073 100644 (file)
@@ -2216,6 +2216,12 @@ void dcn10_enable_vblanks_synchronization(
                opp = grouped_pipes[i]->stream_res.opp;
                tg = grouped_pipes[i]->stream_res.tg;
                tg->funcs->get_otg_active_size(tg, &width, &height);
+
+               if (!tg->funcs->is_tg_enabled(tg)) {
+                       DC_SYNC_INFO("Skipping timing sync on disabled OTG\n");
+                       return;
+               }
+
                if (opp->funcs->opp_program_dpg_dimensions)
                        opp->funcs->opp_program_dpg_dimensions(opp, width, 2*(height) + 1);
        }