Reorder the code to fix the warning. Fixes: 8808f3ffb14d79 ("drm/amd/display: Add DP-HDMI FRL PCON Support in DC") Cc: Fangzhi Zuo <Jerry.Zuo@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 66dacde7a7cc..62510b643882 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -4684,12 +4684,12 @@ static void get_active_converter_info( #if defined(CONFIG_DRM_AMD_DC_DCN) if (link->dc->caps.hdmi_frl_pcon_support) { + union hdmi_encoded_link_bw hdmi_encoded_link_bw; + link->dpcd_caps.dongle_caps.dp_hdmi_frl_max_link_bw_in_kbps = dc_link_bw_kbps_from_raw_frl_link_rate_data( hdmi_color_caps.bits.MAX_ENCODED_LINK_BW_SUPPORT); - union hdmi_encoded_link_bw hdmi_encoded_link_bw; - // Intersect reported max link bw support with the supported link rate post FRL link training if (core_link_read_dpcd(link, DP_PCON_HDMI_POST_FRL_STATUS, &hdmi_encoded_link_bw.raw, sizeof(hdmi_encoded_link_bw)) == DC_OK) { -- 2.31.1