[PATCH] drm/amd/display: Handle NULL dccg in dce110_disable_stream

[Alex Deucher]

On Mon, Sep 11, 2023 at 10:36 AM Michel Dänzer <michel at daenzer.net> wrote:
>
> From: Michel Dänzer <mdaenzer at redhat.com>
>
> It can be NULL e.g. with Raven.
>
> Fixes: 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
> Signed-off-by: Michel Dänzer <mdaenzer at redhat.com>

Looks like this was fixed in:
https://gitlab.freedesktop.org/agd5f/linux/-/commit/7f7925e258288cfcfa2b0e0631fcd91a39744f94
but needs to be applied to 6.6.  I'll queue it up for 6.6.

Alex

> ---
>  drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
> index ad967b58d7be..a9dca69ee8f6 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
> @@ -1179,9 +1179,11 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx)
>                 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 (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST && dccg->funcs->disable_symclk_se)
> +       } else if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST &&
> +                  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)) {
>                 /* TODO: This looks like a bug to me as we are disabling HPO IO when
> --
> 2.40.1
>