diff options
| author |   Harry Wentland <harry.wentland@amd.com> | 2017-10-13 12:42:01 -0400 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2017-10-21 16:50:21 -0400 |
| commit | 94c6d735e9ca13018da40f633fd602af6e272cc6 (patch) | |
| tree | 9bd7540248291002b1660bee0e2e8200c63d2a3e | |
| parent | drm/amd/display: ASSERT on dc_create_state failing. (diff) | |
| download | wireguard-linux-94c6d735e9ca13018da40f633fd602af6e272cc6.tar.xz wireguard-linux-94c6d735e9ca13018da40f633fd602af6e272cc6.zip | |
drm/amd/display: Fix non-DCN build
Acquire_first_split_pipe only makes sense for DCN.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 |
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; |