From: Dave Airlie Date: Mon, 23 Oct 2023 08:20:06 +0000 (+1000) Subject: BackMerge tag 'v6.6-rc7' into drm-next X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7cd62eab9babd1fed9c497141650b31168f4f430;p=users%2Fjedix%2Flinux-maple.git BackMerge tag 'v6.6-rc7' into drm-next This is needed to add the msm pr which is based on a higher base. Signed-off-by: Dave Airlie --- 7cd62eab9babd1fed9c497141650b31168f4f430 diff --cc drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c index 74602a5fd6dd,2a6157555fd1..2ff8addad4f3 --- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c @@@ -1183,13 -1178,14 +1183,14 @@@ void dce110_disable_stream(struct pipe_ dto_params.otg_inst = tg->inst; dto_params.timing = &pipe_ctx->stream->timing; dp_hpo_inst = pipe_ctx->stream_res.hpo_dp_stream_enc->inst; - - dccg->funcs->set_dtbclk_dto(dccg, &dto_params); - dccg->funcs->disable_symclk32_se(dccg, dp_hpo_inst); - dccg->funcs->set_dpstreamclk(dccg, REFCLK, tg->inst, dp_hpo_inst); + if (dccg) { + dccg->funcs->set_dtbclk_dto(dccg, &dto_params); + dccg->funcs->disable_symclk32_se(dccg, dp_hpo_inst); + dccg->funcs->set_dpstreamclk(dccg, REFCLK, tg->inst, dp_hpo_inst); + } } else if (dccg && dccg->funcs->disable_symclk_se) { dccg->funcs->disable_symclk_se(dccg, stream_enc->stream_enc_inst, - link_enc->transmitter - TRANSMITTER_UNIPHY_A); + link_enc->transmitter - TRANSMITTER_UNIPHY_A); } if (dc->link_srv->dp_is_128b_132b_signal(pipe_ctx)) {