1 files changed, 0 insertions, 39 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4692-drm-amd-display-Update-color-props-when-modeset-is-r.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4692-drm-amd-display-Update-color-props-when-modeset-is-r.patch
deleted file mode 100644
index 0dca7ab7..00000000
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4692-drm-amd-display-Update-color-props-when-modeset-is-r.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d6293434e012add7451d43dbaab419b85ce2f569 Mon Sep 17 00:00:00 2001
-From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
-Date: Thu, 31 May 2018 10:23:37 -0400
-Subject: [PATCH 4692/5725] drm/amd/display: Update color props when modeset is
- required
-
-This fixes issues where color management properties don't persist
-over DPMS on/off, or when the CRTC is moved across connectors.
-
-Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
-Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 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 e308f0c..017fd80 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -5113,8 +5113,12 @@ static int dm_update_crtcs_state(struct amdgpu_display_manager *dm,
- 			update_stream_scaling_settings(
- 				&new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream);
- 
--		/* Color managment settings */
--		if (dm_new_crtc_state->base.color_mgmt_changed) {
-+		/*
-+		 * Color management settings. We also update color properties
-+		 * when a modeset is needed, to ensure it gets reprogrammed.
-+		 */
-+		if (dm_new_crtc_state->base.color_mgmt_changed ||
-+		    drm_atomic_crtc_needs_modeset(new_crtc_state)) {
- 			ret = amdgpu_dm_set_regamma_lut(dm_new_crtc_state);
- 			if (ret)
- 				goto fail;
--- 
-2.7.4
-