aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2696-amdgpu-dm-Remove-fb_location-form-fill_plane_attribu.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2696-amdgpu-dm-Remove-fb_location-form-fill_plane_attribu.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2696-amdgpu-dm-Remove-fb_location-form-fill_plane_attribu.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2696-amdgpu-dm-Remove-fb_location-form-fill_plane_attribu.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2696-amdgpu-dm-Remove-fb_location-form-fill_plane_attribu.patch
new file mode 100644
index 00000000..42aafdc3
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2696-amdgpu-dm-Remove-fb_location-form-fill_plane_attribu.patch
@@ -0,0 +1,57 @@
+From dbefa8ba1edaaeb9f5ac670b0f4fcbd743033c58 Mon Sep 17 00:00:00 2001
+From: Harry Wentland <harry.wentland@amd.com>
+Date: Wed, 8 Nov 2017 09:58:59 -0500
+Subject: [PATCH 2696/4131] amdgpu/dm: Remove fb_location form
+ fill_plane_attributes
+
+We no longer set the framebuffer address here so this is now
+dead code.
+
+Signed-off-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 -------------
+ 1 file changed, 13 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 4935694..95760a2 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -1866,8 +1866,6 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
+ const struct amdgpu_framebuffer *amdgpu_fb)
+ {
+ uint64_t tiling_flags;
+- uint64_t fb_location = 0;
+- uint64_t chroma_addr = 0;
+ unsigned int awidth;
+ const struct drm_framebuffer *fb = &amdgpu_fb->base;
+ int ret = 0;
+@@ -1921,8 +1919,6 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
+
+ if (plane_state->format < SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) {
+ plane_state->address.type = PLN_ADDR_TYPE_GRAPHICS;
+- plane_state->address.grph.addr.low_part = lower_32_bits(fb_location);
+- plane_state->address.grph.addr.high_part = upper_32_bits(fb_location);
+ plane_state->plane_size.grph.surface_size.x = 0;
+ plane_state->plane_size.grph.surface_size.y = 0;
+ plane_state->plane_size.grph.surface_size.width = fb->width;
+@@ -1939,15 +1935,6 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,
+ } else {
+ awidth = ALIGN(fb->width, 64);
+ plane_state->address.type = PLN_ADDR_TYPE_VIDEO_PROGRESSIVE;
+- plane_state->address.video_progressive.luma_addr.low_part
+- = lower_32_bits(fb_location);
+- plane_state->address.video_progressive.luma_addr.high_part
+- = upper_32_bits(fb_location);
+- chroma_addr = fb_location + (u64)(awidth * fb->height);
+- plane_state->address.video_progressive.chroma_addr.low_part
+- = lower_32_bits(chroma_addr);
+- plane_state->address.video_progressive.chroma_addr.high_part
+- = upper_32_bits(chroma_addr);
+ plane_state->plane_size.video.luma_size.x = 0;
+ plane_state->plane_size.video.luma_size.y = 0;
+ plane_state->plane_size.video.luma_size.width = awidth;
+--
+2.7.4
+