From: Charlene Liu Date: Tue, 5 Apr 2022 20:13:45 +0000 (-0400) Subject: drm/amd/display: use updated clock source init routine X-Git-Tag: block-6.0-2022-08-12~28^2~16^2~274 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=218987fdead218ae0e714cd9059bc9fc480220f9;p=linux-block.git drm/amd/display: use updated clock source init routine [why] Use correct clock source initialization routine for DCN32/321 Signed-off-by: Charlene Liu Acked-by: Aurabindo Pillai Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c index 64d1a6bf0683..7772beadd000 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c @@ -1090,7 +1090,7 @@ static struct clock_source *dcn32_clock_source_create( if (!clk_src) return NULL; - if (dcn3_clk_src_construct(clk_src, ctx, bios, id, + if (dcn31_clk_src_construct(clk_src, ctx, bios, id, regs, &cs_shift, &cs_mask)) { clk_src->base.dp_clk_src = dp_clk_src; return &clk_src->base; diff --git a/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c index 28e4d7904d54..0b420466b6dd 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c @@ -1088,7 +1088,7 @@ static struct clock_source *dcn321_clock_source_create( if (!clk_src) return NULL; - if (dcn3_clk_src_construct(clk_src, ctx, bios, id, + if (dcn31_clk_src_construct(clk_src, ctx, bios, id, regs, &cs_shift, &cs_mask)) { clk_src->base.dp_clk_src = dp_clk_src; return &clk_src->base;