]> git.baikalelectronics.ru Git - kernel.git/commitdiff
amdgpu/dm: Remove fb_location form fill_plane_attributes
authorHarry Wentland <harry.wentland@amd.com>
Wed, 8 Nov 2017 14:58:59 +0000 (09:58 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Dec 2017 21:41:46 +0000 (16:41 -0500)
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

index 550e3bd923b260168ff675459e799147c51bc336..3bc314872304865c16e464a5662b5dd684e49a6c 100644 (file)
@@ -1787,8 +1787,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;
@@ -1834,8 +1832,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;
@@ -1848,15 +1844,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;