[PATCH] drm/amd/display: fix high part address in dm_plane_helper_prepare_fb()

[Alex Deucher]

On Wed, Oct 25, 2017 at 6:01 AM, S, Shirish <Shirish.S at amd.com> wrote:
> From: Shirish S <shirish.s at amd.com>
>
> The high part calculation of luma and chroma address' was missing in dm_plane_helper_prepare_fb().
>
> This fix brings uniformity in the address' at atomic_check and atomic_commit for both RGB & YUV planes.
>
> Signed-off-by: Shirish S <shirish.s at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 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 d0ee1b3..cbde567 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -2924,6 +2924,7 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
>         struct amdgpu_framebuffer *afb;
>         struct drm_gem_object *obj;
>         struct amdgpu_bo *rbo;
> +       uint64_t chroma_addr = 0;
>         int r;
>         struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old;
>         unsigned int awidth;
> @@ -2965,11 +2966,16 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
>                         plane_state->address.grph.addr.high_part = upper_32_bits(afb->address);
>                 } else {
>                         awidth = ALIGN(new_state->fb->width, 64);
> +                       plane_state->address.type = PLN_ADDR_TYPE_VIDEO_PROGRESSIVE;
>                         plane_state->address.video_progressive.luma_addr.low_part
>                                                         = lower_32_bits(afb->address);
> +                       plane_state->address.video_progressive.luma_addr.high_part
> +                                                       = upper_32_bits(afb->address);
> +                       chroma_addr = afb->address + (u64)(awidth * new_state->fb->height);
>                         plane_state->address.video_progressive.chroma_addr.low_part
> -                                                       = lower_32_bits(afb->address) +
> -                                                               (awidth * new_state->fb->height);
> +                                                       = lower_32_bits(chroma_addr);
> +                       plane_state->address.video_progressive.chroma_addr.high_part
> +                                                       = upper_32_bits(chroma_addr);
>                 }
>         }
>
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx