projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5771ec8
)
drm/amd/display: Fix non-DCN build
author
Harry Wentland
<
[email protected]
>
Fri, 13 Oct 2017 16:42:01 +0000
(12:42 -0400)
committer
Alex Deucher
<
[email protected]
>
Sat, 21 Oct 2017 20:50:21 +0000
(16:50 -0400)
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]
>
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
patch
|
blob
|
history
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 2a5c917724730ebf97b64c0e22305571dda62a6e..55feb16b1fd735380c90ddda135c9b0b4893b8a3 100644
(file)
--- 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;