1 files changed, 57 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2489-drm-amd-display-Fixed-validation-return-wrong-result.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2489-drm-amd-display-Fixed-validation-return-wrong-result.patch
new file mode 100644
index 00000000..7f3ad68c
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2489-drm-amd-display-Fixed-validation-return-wrong-result.patch
@@ -0,0 +1,57 @@
+From fa4cc7fd6b77a906f4e573d1c31aa56197e4df82 Mon Sep 17 00:00:00 2001
+From: Yongqiang Sun <yongqiang.sun@amd.com>
+Date: Wed, 20 Sep 2017 17:06:18 -0400
+Subject: [PATCH 2489/4131] drm/amd/display: Fixed validation return wrong
+ result.
+
+Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <Harry.Wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dc.h               | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index ded1444..5d9bf19 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -4998,7 +4998,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
+ 		if (ret)
+ 			goto fail;
+ 
+-		if (!dc_validate_global_state(dc, dm_state->context)) {
++		if (dc_validate_global_state(dc, dm_state->context) != DC_OK) {
+ 			ret = -EINVAL;
+ 			goto fail;
+ 		}
+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 77b3474..d9a2d09 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+@@ -1716,7 +1716,7 @@ void dc_resource_state_construct(
+ 	dst_ctx->dis_clk = dc->res_pool->display_clock;
+ }
+ 
+-bool dc_validate_global_state(
++enum dc_status dc_validate_global_state(
+ 		struct dc *dc,
+ 		struct dc_state *new_ctx)
+ {
+diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
+index 5d063c2..0817f24 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc.h
++++ b/drivers/gpu/drm/amd/display/dc/dc.h
+@@ -666,7 +666,7 @@ bool dc_validate_stream(struct dc *dc, struct dc_stream_state *stream);
+ 
+ bool dc_validate_plane(struct dc *dc, const struct dc_plane_state *plane_state);
+ 
+-bool dc_validate_global_state(
++enum dc_status dc_validate_global_state(
+ 		struct dc *dc,
+ 		struct dc_state *new_ctx);
+ 
+-- 
+2.7.4
+