1 files changed, 48 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3095-drm-amd-display-cleanup-after-FBC-init-rework.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3095-drm-amd-display-cleanup-after-FBC-init-rework.patch
new file mode 100644
index 00000000..4605a79d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3095-drm-amd-display-cleanup-after-FBC-init-rework.patch
@@ -0,0 +1,48 @@
+From ecb65e3e7b367cd8b53d78adfddeb4f78baac5e6 Mon Sep 17 00:00:00 2001
+From: Roman Li <Roman.Li@amd.com>
+Date: Wed, 13 Dec 2017 17:29:01 -0500
+Subject: [PATCH 3095/4131] drm/amd/display: cleanup after FBC init rework
+
+After reworking FBC init for dynamic mem alloc
+old FBC init code in DC became redundant.
+Removing it.
+
+Signed-off-by: Roman Li <Roman.Li@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <harry.wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 3 ---
+ drivers/gpu/drm/amd/display/dc/dc.h      | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index efa235c..6aef36b 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -359,9 +359,6 @@ static bool construct(struct dc *dc,
+ 	dc_version = resource_parse_asic_id(init_params->asic_id);
+ 	dc_ctx->dce_version = dc_version;
+ 
+-#if defined(CONFIG_DRM_AMD_DC_FBC)
+-	dc->ctx->fbc_gpu_addr = init_params->fbc_gpu_addr;
+-#endif
+ 	/* Resource should construct all asic specific resources.
+ 	 * This should be the only place where we need to parse the asic id
+ 	 */
+diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
+index 129f4e9..9d0867e 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc.h
++++ b/drivers/gpu/drm/amd/display/dc/dc.h
+@@ -288,9 +288,6 @@ struct dc_init_data {
+ 
+ 	struct dc_config flags;
+ 	uint32_t log_mask;
+-#if defined(CONFIG_DRM_AMD_DC_FBC)
+-	uint64_t fbc_gpu_addr;
+-#endif
+ };
+ 
+ struct dc *dc_create(const struct dc_init_data *init_params);
+-- 
+2.7.4
+