[PATCH 2/3] drm/amd/display: Don't overwrite dce60_clk_mgr

[Rodrigo Siqueira]

On 07/22, Timur Kristóf wrote:
> dc_clk_mgr_create accidentally overwrites the dce60_clk_mgr
> with the dce_clk_mgr, causing incorrect behaviour on DCE6.

Could you ellaborate on what do you mean by incorrect behaviour?

> Fix it by removing the extra dce_clk_mgr_construct.
> 
> Fixes: 62eab49faae7 ("drm/amd/display: hide VGH asic specific structs")
> Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
> ---
>  drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> index 33b9d36619ff..4071851f9e86 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> @@ -158,7 +158,6 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p
>  			return NULL;
>  		}
>  		dce60_clk_mgr_construct(ctx, clk_mgr);
> -		dce_clk_mgr_construct(ctx, clk_mgr);

I suppose this error was not detected at the time because of the
CONFIG_DRM_AMD_DC_SI guard. This lgtm, but I guess it would be nice to
test this patch with other SI devices just to be sure

Reviewed-by: Rodrigo Siqueira <siqueira at igalia.com>

I added other display folks.

Thanks

>  		return &clk_mgr->base;
>  	}
>  #endif
> -- 
> 2.50.1
> 

-- 
Rodrigo Siqueira