aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/1031-drm-amd-display-Set-add_stream_ctx-for-CZ-Hawaii-and.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1031-drm-amd-display-Set-add_stream_ctx-for-CZ-Hawaii-and.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/1031-drm-amd-display-Set-add_stream_ctx-for-CZ-Hawaii-and.patch121
1 files changed, 121 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1031-drm-amd-display-Set-add_stream_ctx-for-CZ-Hawaii-and.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1031-drm-amd-display-Set-add_stream_ctx-for-CZ-Hawaii-and.patch
new file mode 100644
index 00000000..91b05abc
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1031-drm-amd-display-Set-add_stream_ctx-for-CZ-Hawaii-and.patch
@@ -0,0 +1,121 @@
+From 4b306b775961c1ac7c7f3f1e248f3958f2832ca7 Mon Sep 17 00:00:00 2001
+From: Harry Wentland <harry.wentland@amd.com>
+Date: Fri, 25 Aug 2017 16:33:40 -0400
+Subject: [PATCH 1031/4131] drm/amd/display: Set add_stream_ctx for CZ, Hawaii
+ and others
+
+Change-Id: Ieed31e202f7c92b605ceb7d1c95401296549c662
+Signed-off-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
+Acked-by: Harry Wentland <Harry.Wentland@amd.com>
+---
+ .../gpu/drm/amd/display/dc/dce100/dce100_resource.c | 19 +++++++++++++++++++
+ .../gpu/drm/amd/display/dc/dce100/dce100_resource.h | 5 +++++
+ .../gpu/drm/amd/display/dc/dce110/dce110_resource.c | 20 ++++++++++++++++++++
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 1 +
+ 4 files changed, 45 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+index 36d7917..ca6c7c2 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+@@ -713,6 +713,24 @@ enum dc_status dce100_validate_global(
+ return DC_OK;
+ }
+
++enum dc_status dce100_add_stream_to_ctx(
++ struct dc *dc,
++ struct dc_state *new_ctx,
++ struct dc_stream_state *dc_stream)
++{
++ enum dc_status result = DC_ERROR_UNEXPECTED;
++
++ result = resource_map_pool_resources(dc, new_ctx, dc_stream);
++
++ if (result == DC_OK)
++ result = resource_map_clock_resources(dc, new_ctx, dc_stream);
++
++ if (result == DC_OK)
++ result = build_mapped_resource(dc, new_ctx, dc_stream);
++
++ return result;
++}
++
+ enum dc_status dce100_validate_guaranteed(
+ struct dc *dc,
+ struct dc_stream_state *dc_stream,
+@@ -769,6 +787,7 @@ static const struct resource_funcs dce100_res_pool_funcs = {
+ .validate_guaranteed = dce100_validate_guaranteed,
+ .validate_bandwidth = dce100_validate_bandwidth,
+ .validate_plane = dce100_validate_plane,
++ .add_stream_to_ctx = dce100_add_stream_to_ctx,
+ .validate_global = dce100_validate_global
+ };
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.h b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.h
+index ca7b2b7..f52cae2 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.h
++++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.h
+@@ -18,4 +18,9 @@ struct resource_pool *dce100_create_resource_pool(
+
+ enum dc_status dce100_validate_plane(const struct dc_plane_state *plane_state);
+
++enum dc_status dce100_add_stream_to_ctx(
++ struct dc *dc,
++ struct dc_state *new_ctx,
++ struct dc_stream_state *dc_stream);
++
+ #endif /* DCE100_RESOURCE_H_ */
+diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+index 4942460..41bfddf 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+@@ -921,6 +921,25 @@ enum dc_status dce110_validate_global(
+ return DC_OK;
+ }
+
++static enum dc_status dce110_add_stream_to_ctx(
++ struct dc *dc,
++ struct dc_state *new_ctx,
++ struct dc_stream_state *dc_stream)
++{
++ enum dc_status result = DC_ERROR_UNEXPECTED;
++
++ result = resource_map_pool_resources(dc, new_ctx, dc_stream);
++
++ if (result == DC_OK)
++ result = resource_map_clock_resources(dc, new_ctx, dc_stream);
++
++
++ if (result == DC_OK)
++ result = build_mapped_resource(dc, new_ctx, dc_stream);
++
++ return result;
++}
++
+ static enum dc_status dce110_validate_guaranteed(
+ struct dc *dc,
+ struct dc_stream_state *dc_stream,
+@@ -1030,6 +1049,7 @@ static const struct resource_funcs dce110_res_pool_funcs = {
+ .validate_guaranteed = dce110_validate_guaranteed,
+ .validate_bandwidth = dce110_validate_bandwidth,
+ .acquire_idle_pipe_for_layer = dce110_acquire_underlay,
++ .add_stream_to_ctx = dce110_add_stream_to_ctx,
+ .validate_global = dce110_validate_global
+ };
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+index 3160807..9234086 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+@@ -791,6 +791,7 @@ static const struct resource_funcs dce80_res_pool_funcs = {
+ .validate_guaranteed = dce80_validate_guaranteed,
+ .validate_bandwidth = dce80_validate_bandwidth,
+ .validate_plane = dce100_validate_plane,
++ .add_stream_to_ctx = dce100_add_stream_to_ctx,
+ .validate_global = dce80_validate_global
+ };
+
+--
+2.7.4
+