From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96D6CC4360F for ; Fri, 5 Apr 2019 09:52:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 666BA21738 for ; Fri, 5 Apr 2019 09:52:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730796AbfDEJwl (ORCPT ); Fri, 5 Apr 2019 05:52:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44164 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730585AbfDEJwY (ORCPT ); Fri, 5 Apr 2019 05:52:24 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F69C3082E0F; Fri, 5 Apr 2019 09:52:24 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 041FA1A7CA; Fri, 5 Apr 2019 09:52:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5A14117532; Fri, 5 Apr 2019 11:52:20 +0200 (CEST) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: noralf@tronnes.org, sam@ravnborg.org, Gerd Hoffmann , Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 3/5] drm: add drm_fb_xrgb8888_to_rgb565_dstclip() Date: Fri, 5 Apr 2019 11:52:17 +0200 Message-Id: <20190405095219.9231-4-kraxel@redhat.com> In-Reply-To: <20190405095219.9231-1-kraxel@redhat.com> References: <20190405095219.9231-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 05 Apr 2019 09:52:24 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is a drm_fb_xrgb8888_to_rgb565() variant which checks the clip rectangle for the destination too. Common code between drm_fb_xrgb8888_to_rgb565() and drm_fb_xrgb8888_to_rgb565_dstclip() was factored out into the drm_fb_xrgb8888_to_rgb565_lines() helper function. Signed-off-by: Gerd Hoffmann --- include/drm/drm_format_helper.h | 5 +- drivers/gpu/drm/drm_format_helper.c | 113 ++++++++++++++++++++-------- 2 files changed, 86 insertions(+), 32 deletions(-) diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h index c52b7b9a25f0..a84d71fa446b 100644 --- a/include/drm/drm_format_helper.h +++ b/include/drm/drm_format_helper.h @@ -19,9 +19,12 @@ void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_rect *clip); void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_rect *clip); -void drm_fb_xrgb8888_to_rgb565(u16 *dst, void *vaddr, +void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_rect *clip, bool swap); +void drm_fb_xrgb8888_to_rgb565_dstclip(void *dst, unsigned int dst_pitch, + void *vaddr, struct drm_framebuffer *fb, + struct drm_rect *clip, bool swap); void drm_fb_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_rect *clip); diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c index 55a2d629a75f..246775510c2e 100644 --- a/drivers/gpu/drm/drm_format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -110,6 +110,44 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, } EXPORT_SYMBOL(drm_fb_swab16); +static void drm_fb_xrgb8888_to_rgb565_lines(void *dst, unsigned int dst_pitch, + void *src, unsigned int src_pitch, + unsigned int src_linelength, + unsigned int lines, + bool swap) +{ + unsigned int linepixels = src_linelength / sizeof(u32); + unsigned int x, y; + u32 *sbuf; + u16 *dbuf, val16; + + /* + * The cma memory is write-combined so reads are uncached. + * Speed up by fetching one line at a time. + */ + sbuf = kmalloc(src_linelength, GFP_KERNEL); + if (!sbuf) + return; + + for (y = 0; y < lines; y++) { + memcpy(sbuf, src, src_linelength); + dbuf = dst; + for (x = 0; x < linepixels; x++) { + val16 = ((sbuf[x] & 0x00F80000) >> 8) | + ((sbuf[x] & 0x0000FC00) >> 5) | + ((sbuf[x] & 0x000000F8) >> 3); + if (swap) + *dbuf++ = swab16(val16); + else + *dbuf++ = val16; + } + src += src_pitch; + dst += dst_pitch; + } + + kfree(sbuf); +} + /** * drm_fb_xrgb8888_to_rgb565 - Convert XRGB8888 to RGB565 clip buffer * @dst: RGB565 destination buffer @@ -120,45 +158,58 @@ EXPORT_SYMBOL(drm_fb_swab16); * * Drivers can use this function for RGB565 devices that don't natively * support XRGB8888. + * + * This function does not apply clipping on dst, i.e. the destination + * is a small buffer containing the clip rect only. */ -void drm_fb_xrgb8888_to_rgb565(u16 *dst, void *vaddr, +void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_rect *clip, bool swap) { - size_t len = (clip->x2 - clip->x1) * sizeof(u32); - unsigned int x, y; - u32 *src, *buf; - u16 val16; + unsigned int src_offset = (clip->y1 * fb->pitches[0]) + + (clip->x1 * sizeof(u32)); + size_t src_len = (clip->x2 - clip->x1) * sizeof(u32); + size_t dst_len = (clip->x2 - clip->x1) * sizeof(u16); - /* - * The cma memory is write-combined so reads are uncached. - * Speed up by fetching one line at a time. - */ - buf = kmalloc(len, GFP_KERNEL); - if (!buf) - return; - - for (y = clip->y1; y < clip->y2; y++) { - src = vaddr + (y * fb->pitches[0]); - src += clip->x1; - memcpy(buf, src, len); - src = buf; - for (x = clip->x1; x < clip->x2; x++) { - val16 = ((*src & 0x00F80000) >> 8) | - ((*src & 0x0000FC00) >> 5) | - ((*src & 0x000000F8) >> 3); - src++; - if (swap) - *dst++ = swab16(val16); - else - *dst++ = val16; - } - } - - kfree(buf); + drm_fb_xrgb8888_to_rgb565_lines(dst, dst_len, + vaddr + src_offset, fb->pitches[0], + src_len, clip->y2 - clip->y1, + swap); } EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565); +/** + * drm_fb_xrgb8888_to_rgb565_dstclip - Convert XRGB8888 to RGB565 clip buffer + * @dst: RGB565 destination buffer + * @dst_pitch: destination buffer pitch + * @vaddr: XRGB8888 source buffer + * @fb: DRM framebuffer + * @clip: Clip rectangle area to copy + * @swap: Swap bytes + * + * Drivers can use this function for RGB565 devices that don't natively + * support XRGB8888. + * + * This function applies clipping on dst, i.e. the destination is a + * full framebuffer but only the clip rect content is copied over. + */ +void drm_fb_xrgb8888_to_rgb565_dstclip(void *dst, unsigned int dst_pitch, + void *vaddr, struct drm_framebuffer *fb, + struct drm_rect *clip, bool swap) +{ + unsigned int src_offset = (clip->y1 * fb->pitches[0]) + + (clip->x1 * sizeof(u32)); + unsigned int dst_offset = (clip->y1 * dst_pitch) + + (clip->x1 * sizeof(u16)); + size_t src_len = (clip->x2 - clip->x1) * sizeof(u32); + + drm_fb_xrgb8888_to_rgb565_lines(dst + dst_offset, dst_pitch, + vaddr + src_offset, fb->pitches[0], + src_len, clip->y2 - clip->y1, + swap); +} +EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565_dstclip); + /** * drm_fb_xrgb8888_to_gray8 - Convert XRGB8888 to grayscale * @dst: 8-bit grayscale destination buffer -- 2.18.1