On 2023-10-20 12:42, Rodrigo Siqueira wrote:
> 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.
>
> Cc: Vitaly Prosyak <vprosyak@xxxxxxx>
> Cc: Roman Li <roman.li@xxxxxxx>
> Cc: Qingqing Zhuo <Qingqing.Zhuo@xxxxxxx>
> Cc: Daniel Wheeler <daniel.wheeler@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Fixes: 7966f319c66d ("drm/amd/display: Introduce DML2")
> Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index 97f402123fbb..73cc6e1b0e65 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -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.dchub_ref_clock_inKhz =
> res_pool->ref_clocks.xtalin_clock_inKhz;
> - if (res_pool->hubbub && res_pool->hubbub->funcs->get_dchub_ref_freq)
> - res_pool->hubbub->funcs->get_dchub_ref_freq(res_pool->hubbub,
> - res_pool->ref_clocks.dccg_ref_clock_inKhz,
> - &res_pool->ref_clocks.dchub_ref_clock_inKhz);
> + if (dc_version >= DCN_VERSION_3_5)
A better check would be dc->debug.using_dml2
Harry
> + if (res_pool->hubbub && res_pool->hubbub->funcs->get_dchub_ref_freq)
> + res_pool->hubbub->funcs->get_dchub_ref_freq(res_pool->hubbub,
> + res_pool->ref_clocks.dccg_ref_clock_inKhz,
> + &res_pool->ref_clocks.dchub_ref_clock_inKhz);
> } else
> ASSERT_CRITICAL(false);
> }
