1 files changed, 77 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3237-drm-amdgpu-rename-amdgpu_user_framebuffer_create.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3237-drm-amdgpu-rename-amdgpu_user_framebuffer_create.patch
new file mode 100644
index 00000000..345d340b
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3237-drm-amdgpu-rename-amdgpu_user_framebuffer_create.patch
@@ -0,0 +1,77 @@
+From 85948ce7710ad94737a5067f5e48fed9764592f1 Mon Sep 17 00:00:00 2001
+From: Samuel Li <Samuel.Li@amd.com>
+Date: Fri, 19 Jan 2018 12:24:39 -0500
+Subject: [PATCH 3237/4131] drm/amdgpu: rename amdgpu_user_framebuffer_create
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add display to the name for consistency.
+
+Signed-off-by: Samuel Li <Samuel.Li@amd.com>
+Acked-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+Conflicts:
+      drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+      drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
+      drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+
+Change-Id: I34128c08ede610499b401ed4563d4206a6eff7a2
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c       | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.h       | 2 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+index 3b90058..fe96e76 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+@@ -543,7 +543,7 @@ amdgpu_display_framebuffer_init(struct drm_device *dev,
+ }
+ 
+ struct drm_framebuffer *
+-amdgpu_user_framebuffer_create(struct drm_device *dev,
++amdgpu_display_user_framebuffer_create(struct drm_device *dev,
+ 			       struct drm_file *file_priv,
+ 			       const struct drm_mode_fb_cmd2 *mode_cmd)
+ {
+@@ -588,7 +588,7 @@ void amdgpu_output_poll_changed(struct drm_device *dev)
+ }
+ 
+ const struct drm_mode_config_funcs amdgpu_mode_funcs = {
+-	.fb_create = amdgpu_user_framebuffer_create,
++	.fb_create = amdgpu_display_user_framebuffer_create,
+ 	.output_poll_changed = amdgpu_output_poll_changed
+ };
+ 
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
+index c42a627..4471b2d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
+@@ -25,7 +25,7 @@
+ 
+ uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev);
+ struct drm_framebuffer *
+-amdgpu_user_framebuffer_create(struct drm_device *dev,
++amdgpu_display_user_framebuffer_create(struct drm_device *dev,
+ 			       struct drm_file *file_priv,
+ 			       const struct drm_mode_fb_cmd2 *mode_cmd);
+ void amdgpu_output_poll_changed(struct drm_device *dev);
+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 7bf1d67..8998953 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -865,7 +865,7 @@ dm_atomic_state_alloc_free(struct drm_atomic_state *state)
+ }
+ 
+ static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = {
+-	.fb_create = amdgpu_user_framebuffer_create,
++	.fb_create = amdgpu_display_user_framebuffer_create,
+ 	.output_poll_changed = amdgpu_output_poll_changed,
+ 	.atomic_check = amdgpu_dm_atomic_check,
+ 	.atomic_commit = amdgpu_dm_atomic_commit,
+-- 
+2.7.4
+