Re: [PATCH] drm/amd/display: fix typos in several function pointer checks

[Alex Deucher <alexdeucher@xxxxxxxxx>]

Applied.  Thanks!

On Sat, Sep 21, 2024 at 3:48 AM Vitaliy Shevtsov <v.shevtsov@xxxxxxxxx> wrote:
>
> Fix several copypaste mistakes in *_disable_link_output() functions where
> an improper function pointer is checked before dereference.
>
> Found by Linux Verification Center (linuxtesting.org) with Svace.
>
> Signed-off-by: Vitaliy Shevtsov <v.shevtsov@xxxxxxxxx>
> ---
>  drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 2 +-
>  drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 2 +-
>  drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c   | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
> index d52ce58c6a98..c2364cb66d0b 100644
> --- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
> +++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
> @@ -3258,7 +3258,7 @@ void dce110_disable_link_output(struct dc_link *link,
>          * from enable/disable link output and only call edp panel control
>          * in enable_link_dp and disable_link_dp once.
>          */
> -       if (dmcu != NULL && dmcu->funcs->lock_phy)
> +       if (dmcu != NULL && dmcu->funcs->unlock_phy)
>                 dmcu->funcs->unlock_phy(dmcu);
>         dc->link_srv->dp_trace_source_sequence(link, DPCD_SOURCE_SEQ_AFTER_DISABLE_LINK_PHY);
>  }
> diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c
> index 4e93eeedfc1b..5b6cf2a8e38d 100644
> --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c
> +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c
> @@ -478,7 +478,7 @@ void dcn314_disable_link_output(struct dc_link *link,
>          * from enable/disable link output and only call edp panel control
>          * in enable_link_dp and disable_link_dp once.
>          */
> -       if (dmcu != NULL && dmcu->funcs->lock_phy)
> +       if (dmcu != NULL && dmcu->funcs->unlock_phy)
>                 dmcu->funcs->unlock_phy(dmcu);
>         dc->link_srv->dp_trace_source_sequence(link, DPCD_SOURCE_SEQ_AFTER_DISABLE_LINK_PHY);
>
> diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
> index a36e11606f90..84153682af1a 100644
> --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
> +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
> @@ -1384,10 +1384,10 @@ void dcn32_disable_link_output(struct dc_link *link,
>         link->phy_state.symclk_state = SYMCLK_OFF_TX_OFF;
>
>         if (signal == SIGNAL_TYPE_EDP &&
> -                       link->dc->hwss.edp_backlight_control &&
> +                       link->dc->hwss.edp_power_control &&
>                         !link->skip_implict_edp_power_control)
>                 link->dc->hwss.edp_power_control(link, false);
> -       else if (dmcu != NULL && dmcu->funcs->lock_phy)
> +       else if (dmcu != NULL && dmcu->funcs->unlock_phy)
>                 dmcu->funcs->unlock_phy(dmcu);
>
>         dc->link_srv->dp_trace_source_sequence(link, DPCD_SOURCE_SEQ_AFTER_DISABLE_LINK_PHY);
> --
> 2.46.1
>