Skip to contentSkip to conversation

drm/amd/display: Fix non-DCN build

PATCH In review Harry Wentland 3 participants 3 messages Oct 13, 2017 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: Fix non-DCN build

Acquire_first_split_pipe only makes sense for DCN.

---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -0
index 2a5c91772473..55feb16b1fd7 100644
@@ -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;
Signature · 6 lines
2.14.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20171013164400.19199-1-harry.wentland-5C7GfCeVMHo@public.gmane.org

Reviewed-by Alex Deucher
#2 lore raw
Quoted 9 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Harry Wentland
Sent: Friday, October 13, 2017 12:44 PM
To: [email protected]; [email protected]; Deucher, Alexander
Cc: Wentland, Harry
Subject: [PATCH] drm/amd/display: Fix non-DCN build

Quoted 3 lines

Acquire_first_split_pipe only makes sense for DCN.

Quoted 25 lines
---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -0
index 2a5c91772473..55feb16b1fd7 100644
@@ -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
 
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +0 -1
 	if (pipe_idx < 0)
 		return DC_NO_CONTROLLER_RESOURCE;
--

2.14.1

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Tested-by
#3 lore raw
In reply to a message not in the archive

Am 13.10.2017 18:44, schrieb Harry Wentland:

Quoted 3 lines

Acquire_first_split_pipe only makes sense for DCN.

Quoted 20 lines
---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -0
index 2a5c91772473..55feb16b1fd7 100644
@@ -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)
Quoted 1 line

return DC_NO_CONTROLLER_RESOURCE;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx