From de1b8efb44c2e4fba7af7fdb6e004b63fb44e76e Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 26 May 2022 15:43:50 +0800 Subject: [PATCH] drm/rockchip: use drm_format_info_min_pitch calculate pixel pitch According to comment in drm_format_info, drm_format_info_min_pitch has better compatibility than calculate by cpp. Signed-off-by: Andy Yan Change-Id: I246f29bc6a5482242ff8d533c0416101a04c7550 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 0cc5a5eb7c5f..afe237dd8a89 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -4325,11 +4325,10 @@ static void vop2_win_atomic_update(struct vop2_win *win, struct drm_rect *src, s */ if (win->splice_mode_right) { splice_pixel_offset = (src->x1 - left_src->x1) >> 16; - splice_yrgb_offset = splice_pixel_offset * fb->format->cpp[0]; - + splice_yrgb_offset = drm_format_info_min_pitch(fb->format, 0, splice_pixel_offset); if (fb->format->is_yuv && fb->format->num_planes > 1) { hsub = fb->format->hsub; - splice_uv_offset = splice_pixel_offset * fb->format->cpp[1] / hsub; + splice_uv_offset = drm_format_info_min_pitch(fb->format, 1, splice_pixel_offset / hsub); } }