On Thu, Sep 08, 2016 at 05:44:24PM +0300, Laurent Pinchart wrote:
> The driver needs the number of bytes per pixel, not the bpp and depth
> info meant for fbdev compatibility. Use the right API.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> Changes since v3:
>
> - Renamed bpp to cpp
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 14 +++++++-------
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 ++-
> 2 files changed, 9 insertions(+), 8 deletions(-)
>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: Christian König <christian.koenig@xxxxxxx>
> Cc: Michel Dänzer <michel@xxxxxxxxxxx>
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> index bf033b58056c..0727946db189 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> @@ -62,12 +62,12 @@ static struct fb_ops amdgpufb_ops = {
> };
>
>
> -int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tiled)
> +int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int cpp, bool tiled)
> {
> int aligned = width;
> int pitch_mask = 0;
>
> - switch (bpp / 8) {
> + switch (cpp) {
> case 1:
> pitch_mask = 255;
> break;
> @@ -82,7 +82,7 @@ int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tile
>
> aligned += pitch_mask;
> aligned &= ~pitch_mask;
> - return aligned;
> + return aligned * cpp;
Now you multiply by cpp after the rounding. Otherwise looks reasonable.
-Daniel
> }
>
> static void amdgpufb_destroy_pinned_object(struct drm_gem_object *gobj)
> @@ -111,13 +111,13 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
> int ret;
> int aligned_size, size;
> int height = mode_cmd->height;
> - u32 bpp, depth;
> + u32 cpp;
>
> - drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
> + cpp = drm_format_plane_cpp(mode_cmd->pixel_format, 0);
>
> /* need to align pitch with crtc limits */
> - mode_cmd->pitches[0] = amdgpu_align_pitch(adev, mode_cmd->width, bpp,
> - fb_tiled) * ((bpp + 1) / 8);
> + mode_cmd->pitches[0] = amdgpu_align_pitch(adev, mode_cmd->width, cpp,
> + fb_tiled);
>
> height = ALIGN(mode_cmd->height, 8);
> size = mode_cmd->pitches[0] * height;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 88fbed2389c0..20a4e569b245 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -704,7 +704,8 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
> uint32_t handle;
> int r;
>
> - args->pitch = amdgpu_align_pitch(adev, args->width, args->bpp, 0) * ((args->bpp + 1) / 8);
> + args->pitch = amdgpu_align_pitch(adev, args->width,
> + DIV_ROUND_UP(args->bpp, 8), 0);
> args->size = (u64)args->pitch * args->height;
> args->size = ALIGN(args->size, PAGE_SIZE);
>
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
