aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarry Wentland <[email protected]>2017-10-13 12:42:01 -0400
committerAlex Deucher <[email protected]>2017-10-21 16:50:21 -0400
commit94c6d735e9ca13018da40f633fd602af6e272cc6 (patch)
tree9bd7540248291002b1660bee0e2e8200c63d2a3e
parent5771ec8fe8cb99c0db3115e81b4f69b1543c6982 (diff)
drm/amd/display: Fix non-DCN build
Acquire_first_split_pipe only makes sense for DCN. Signed-off-by: Harry Wentland <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_resource.c2
1 files changed, 2 insertions, 0 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 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;