drm/amd/display: check TG is non-null before checking if enabled
authorjsg <jsg@openbsd.org>
Fri, 28 Jul 2023 06:43:33 +0000 (06:43 +0000)
committerjsg <jsg@openbsd.org>
Fri, 28 Jul 2023 06:43:33 +0000 (06:43 +0000)
From Taimur Hassan
889bac5fd7969b745c0554155852ce1e3c140497 in linux-6.1.y/6.1.42
5a25cefc0920088bb9afafeb80ad3dcd84fe278b in mainline linux

sys/dev/pci/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

index 0dcd9fe..a6fde27 100644 (file)
@@ -3293,7 +3293,8 @@ void dcn10_wait_for_mpcc_disconnect(
                if (pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst]) {
                        struct hubp *hubp = get_hubp_by_inst(res_pool, mpcc_inst);
 
-                       if (pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg))
+                       if (pipe_ctx->stream_res.tg &&
+                               pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg))
                                res_pool->mpc->funcs->wait_for_idle(res_pool->mpc, mpcc_inst);
                        pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst] = false;
                        hubp->funcs->set_blank(hubp, true);