Commit 210aa665 authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher

drm/amd/display: Fix DMUB errors introduced by DML2

When DML 2 was introduced, it changed part of the generic sequence of
DC, which caused issues on previous DCNs with DMUB support. This commit
ensures the new sequence only works for new DCNs from 3.5 and above.

Changes since V1:
- Harry: Use the attribute using_dml2 instead of check the DCN version.

Cc: Vitaly Prosyak <vprosyak@amd.com>
Cc: Roman Li <roman.li@amd.com>
Cc: Qingqing Zhuo <Qingqing.Zhuo@amd.com>
Cc: Daniel Wheeler <daniel.wheeler@amd.com>
Cc: Alex Deucher <Alexander.Deucher@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Fixes: 7966f319 ("drm/amd/display: Introduce DML2")
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e5f52a84
...@@ -321,10 +321,11 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc, ...@@ -321,10 +321,11 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc,
res_pool->ref_clocks.xtalin_clock_inKhz; res_pool->ref_clocks.xtalin_clock_inKhz;
res_pool->ref_clocks.dchub_ref_clock_inKhz = res_pool->ref_clocks.dchub_ref_clock_inKhz =
res_pool->ref_clocks.xtalin_clock_inKhz; res_pool->ref_clocks.xtalin_clock_inKhz;
if (res_pool->hubbub && res_pool->hubbub->funcs->get_dchub_ref_freq) if (dc->debug.using_dml2)
res_pool->hubbub->funcs->get_dchub_ref_freq(res_pool->hubbub, if (res_pool->hubbub && res_pool->hubbub->funcs->get_dchub_ref_freq)
res_pool->ref_clocks.dccg_ref_clock_inKhz, res_pool->hubbub->funcs->get_dchub_ref_freq(res_pool->hubbub,
&res_pool->ref_clocks.dchub_ref_clock_inKhz); res_pool->ref_clocks.dccg_ref_clock_inKhz,
&res_pool->ref_clocks.dchub_ref_clock_inKhz);
} else } else
ASSERT_CRITICAL(false); ASSERT_CRITICAL(false);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment