[PATCH] drm/amd/display: Fix non-DCN build

Dieter@xxxxxxxxxxxxx (Dieter Nützel) · Fri, 13 Oct 2017 23:21:33 +0200



Am 13.10.2017 18:44, schrieb Harry Wentland:
> Acquire_first_split_pipe only makes sense for DCN.
> 
> Signed-off-by: Harry Wentland <harry.wentland at amd.com>

Tested-by: Dieter NÃ¼tzel <Dieter at nuetzel-hh.de>

> ---
>  drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> 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 2a5c91772473..55feb16b1fd7 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -1684,8 +1684,10 @@ enum dc_status resource_map_pool_resources(
>  	/* acquire new resources */
>  	pipe_idx = acquire_first_free_pipe(&context->res_ctx, pool, stream);
> 
> +#ifdef CONFIG_DRM_AMD_DC_DCN1_0
>  	if (pipe_idx < 0)
>  		pipe_idx = acquire_first_split_pipe(&context->res_ctx, pool, 
> stream);
> +#endif
> 
>  	if (pipe_idx < 0)
>  		return DC_NO_CONTROLLER_RESOURCE;