> -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > Of Harry Wentland > Sent: Friday, October 13, 2017 12:44 PM > To: amd-gfx at lists.freedesktop.org; Dieter at nuetzel-hh.de; Deucher, > Alexander > Cc: Wentland, Harry > Subject: [PATCH] drm/amd/display: Fix non-DCN build > > Acquire_first_split_pipe only makes sense for DCN. > > Signed-off-by: Harry Wentland <harry.wentland at amd.com> Reviewed-by: Alex Deucher <alexander.deucher at amd.com> > --- > 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; > -- > 2.14.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
