diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3236-drm-amdgpu-rename-amdgpu_framebuffer_init.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3236-drm-amdgpu-rename-amdgpu_framebuffer_init.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3236-drm-amdgpu-rename-amdgpu_framebuffer_init.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3236-drm-amdgpu-rename-amdgpu_framebuffer_init.patch new file mode 100644 index 00000000..ba4815fd --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3236-drm-amdgpu-rename-amdgpu_framebuffer_init.patch @@ -0,0 +1,76 @@ +From 4a62066c404bf516b05db14d1b869b3dcc91ffc6 Mon Sep 17 00:00:00 2001 +From: Samuel Li <Samuel.Li@amd.com> +Date: Fri, 19 Jan 2018 12:17:42 -0500 +Subject: [PATCH 3236/4131] drm/amdgpu: rename amdgpu_framebuffer_init +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_mode.h + +Change-Id: Ia2443deb9fc0048e9972129ca33d9d51c4e78ca8 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +index de1f879..3b90058 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +@@ -526,7 +526,7 @@ uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev) + } + + int +-amdgpu_framebuffer_init(struct drm_device *dev, ++amdgpu_display_framebuffer_init(struct drm_device *dev, + struct amdgpu_framebuffer *rfb, + const struct drm_mode_fb_cmd2 *mode_cmd, + struct drm_gem_object *obj) +@@ -571,6 +571,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, + } + + ret = amdgpu_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj); ++ ret = amdgpu_display_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj); + if (ret) { + kfree(amdgpu_fb); + drm_gem_object_put_unlocked(obj); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +index 0065768..721ee96 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +@@ -227,7 +227,8 @@ static int amdgpufb_create(struct drm_fb_helper *helper, + info->par = rfbdev; + info->skip_vt_switch = true; + +- ret = amdgpu_framebuffer_init(adev->ddev, &rfbdev->rfb, &mode_cmd, gobj); ++ ret = amdgpu_display_framebuffer_init(adev->ddev, &rfbdev->rfb, ++ &mode_cmd, gobj); + if (ret) { + DRM_ERROR("failed to initialize framebuffer %d\n", ret); + goto out; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +index f82046c..046967d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +@@ -647,7 +647,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, + ktime_t *stime, ktime_t *etime, + const struct drm_display_mode *mode); + +-int amdgpu_framebuffer_init(struct drm_device *dev, ++int amdgpu_display_framebuffer_init(struct drm_device *dev, + struct amdgpu_framebuffer *rfb, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || \ + defined(OS_NAME_RHEL_7_3) || \ +-- +2.7.4 + |