drm/cirrus: Compute blit destination offset in single location

The calculation for the scanout-buffer blit offset is independent
from the color format. In the one case where the current code uses
fb->pitches[0] instead of cirrus->pitch, their values are identical.
Hence merge all into a single line.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230215161517.5113-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
index cf35b609050322e4946190d76d1f82d1b4010ff6..7fb21db8416de6d67ede1f255745de98c788af2c 100644 (file)
--- a/drivers/gpu/drm/tiny/cirrus.c
+++ b/drivers/gpu/drm/tiny/cirrus.c
@@ -327,17 +327,15 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
                return -ENODEV;
 
        iosys_map_set_vaddr_iomem(&dst, cirrus->vram);
+       iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
 
        if (cirrus->cpp == fb->format->cpp[0]) {
-               iosys_map_incr(&dst, drm_fb_clip_offset(fb->pitches[0], fb->format, rect));
                drm_fb_memcpy(&dst, fb->pitches, vmap, fb, rect);
 
        } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) {
-               iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
                drm_fb_xrgb8888_to_rgb565(&dst, &cirrus->pitch, vmap, fb, rect, false);
 
        } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) {
-               iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
                drm_fb_xrgb8888_to_rgb888(&dst, &cirrus->pitch, vmap, fb, rect);
 
        } else {