Skip to content

Commit

Permalink
drm/amd/display: fix typos in several function pointer checks
Browse files Browse the repository at this point in the history
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@maxima.ru>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Vitaliy Shevtsov authored and Alex Deucher committed Sep 26, 2024
1 parent f501057 commit e82b973
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -3315,7 +3315,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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1398,10 +1398,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);
Expand Down

0 comments on commit e82b973

Please sign in to comment.