From patchwork Tue Apr 9 11:59:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 10891147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6040E17EF for ; Tue, 9 Apr 2019 11:59:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E43E28870 for ; Tue, 9 Apr 2019 11:59:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42B4C28880; Tue, 9 Apr 2019 11:59:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D454228870 for ; Tue, 9 Apr 2019 11:59:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39FBB88ECE; Tue, 9 Apr 2019 11:59:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F7A688ECE for ; Tue, 9 Apr 2019 11:59:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F319B308338F; Tue, 9 Apr 2019 11:59:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-65.ams2.redhat.com [10.36.116.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id B912B1001E92; Tue, 9 Apr 2019 11:59:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 17C2D1747B; Tue, 9 Apr 2019 13:59:14 +0200 (CEST) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/4] drm: use convert_lines() in xrgb8888_to_rgb565 helpers. Date: Tue, 9 Apr 2019 13:59:11 +0200 Message-Id: <20190409115913.3468-3-kraxel@redhat.com> In-Reply-To: <20190409115913.3468-1-kraxel@redhat.com> References: <20190409115913.3468-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 09 Apr 2019 11:59:19 +0000 (UTC) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Maxime Ripard , Sean Paul , open list , David Airlie , Gerd Hoffmann , sam@ravnborg.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Also add two conversion functions for the swab / not swab cases. That way we have to check the swab flag only once. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/drm_format_helper.c | 117 +++++++++++++++------------- 1 file changed, 62 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c index f32e0173600c..b8d17cd0a9f8 100644 --- a/drivers/gpu/drm/drm_format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -38,6 +38,46 @@ static struct drm_format_convert convert_swab16 = { .func = convert_swab16_fn, }; +static void convert_xrgb8888_to_rgb565_fn(void *dst, void *src, u32 pixels) +{ + u32 *sbuf = src; + u16 *dbuf = dst; + u32 x; + + for (x = 0; x < pixels; x++) { + dbuf[x] = ((sbuf[x] & 0x00F80000) >> 8) | + ((sbuf[x] & 0x0000FC00) >> 5) | + ((sbuf[x] & 0x000000F8) >> 3); + } +} + +static struct drm_format_convert convert_xrgb8888_to_rgb565 = { + .dst_cpp = 2, + .src_cpp = 4, + .func = convert_xrgb8888_to_rgb565_fn, +}; + +static void convert_xrgb8888_to_rgb565_swab_fn(void *dst, void *src, u32 pixels) +{ + u32 *sbuf = src; + u16 *dbuf = dst; + u16 val16; + u32 x; + + for (x = 0; x < pixels; x++) { + val16 = ((sbuf[x] & 0x00F80000) >> 8) | + ((sbuf[x] & 0x0000FC00) >> 5) | + ((sbuf[x] & 0x000000F8) >> 3); + dbuf[x] = swab16(val16); + } +} + +static struct drm_format_convert convert_xrgb8888_to_rgb565_swap = { + .dst_cpp = 2, + .src_cpp = 4, + .func = convert_xrgb8888_to_rgb565_swab_fn, +}; + static void convert_lines(void *dst, unsigned int dst_pitch, void *src, unsigned int src_pitch, unsigned int pixels, @@ -152,44 +192,6 @@ 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 @@ -208,15 +210,17 @@ void drm_fb_xrgb8888_to_rgb565(void *dst, 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)); - size_t src_len = (clip->x2 - clip->x1) * sizeof(u32); - size_t dst_len = (clip->x2 - clip->x1) * sizeof(u16); + struct drm_format_convert *conv = swap + ? &convert_xrgb8888_to_rgb565_swap + : &convert_xrgb8888_to_rgb565; + unsigned int src_offset = + clip_offset(clip, fb->pitches[0], conv->src_cpp); + size_t pixels = (clip->x2 - clip->x1); + size_t lines = (clip->y2 - clip->y1); - drm_fb_xrgb8888_to_rgb565_lines(dst, dst_len, - vaddr + src_offset, fb->pitches[0], - src_len, clip->y2 - clip->y1, - swap); + convert_lines(dst, pixels * conv->dst_cpp, + vaddr + src_offset, fb->pitches[0], + pixels, lines, conv); } EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565); @@ -239,16 +243,19 @@ 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); + struct drm_format_convert *conv = swap + ? &convert_xrgb8888_to_rgb565_swap + : &convert_xrgb8888_to_rgb565; + unsigned int src_offset = + clip_offset(clip, fb->pitches[0], conv->src_cpp); + unsigned int dst_offset = + clip_offset(clip, dst_pitch, conv->dst_cpp); + size_t pixels = (clip->x2 - clip->x1); + size_t lines = (clip->y2 - clip->y1); - drm_fb_xrgb8888_to_rgb565_lines(dst + dst_offset, dst_pitch, - vaddr + src_offset, fb->pitches[0], - src_len, clip->y2 - clip->y1, - swap); + convert_lines(dst + dst_offset, dst_pitch, + vaddr + src_offset, fb->pitches[0], + pixels, lines, conv); } EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565_dstclip);