From patchwork Wed Feb 9 09:03:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 12740133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AB3DC433EF for ; Wed, 9 Feb 2022 11:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbiBILXj (ORCPT ); Wed, 9 Feb 2022 06:23:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230357AbiBILXh (ORCPT ); Wed, 9 Feb 2022 06:23:37 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B1603E128B97 for ; Wed, 9 Feb 2022 02:17:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644401762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X6Mi9ajTPAaH4GRgHowugsZMJXzFkvUakKFgNQa4uWk=; b=KjoYmQzj5d/h9EkwkwWIKv3s8Cjn5wR2tHK+CEmyqAPHdqzX/ihulnHuvlmWWVBlv2MhXs F3FR464BQd4DO4jzS9JGHKKxvFMCAGot3XKDkCF642kNwk1mdzHqARbM0FS5A/TY9TpK5z jQvAXCq1/QtO2zywqrcpY5tUbc40CuU= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-CPmPxxEMO9q39a3UJL9-qw-1; Wed, 09 Feb 2022 04:03:27 -0500 X-MC-Unique: CPmPxxEMO9q39a3UJL9-qw-1 Received: by mail-wm1-f71.google.com with SMTP id n3-20020a05600c294300b0037bc685b717so215915wmd.8 for ; Wed, 09 Feb 2022 01:03:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X6Mi9ajTPAaH4GRgHowugsZMJXzFkvUakKFgNQa4uWk=; b=3nd8kSAa4mM48dAKJzB2ttNKwod/PleOGjJmSu0xfk7YwOEg/WVWny4pvj6r2Gr60N 3qbbDMdee1K0vyv1nt4uVGxY/vUwZhlsmdjzhTWF7DDP8s/8AKT4+AnCTszlDvis9kaw 9gDi1PgxMpCFQgQGhri6XpzUDG661cYhC7xiJHGah8GUUVPYdxXLTevj+zMUDJP5grGE yHqbfyDo56nNZ0MCi01rVFGPPskUXJw/DMUSNFPQ+1j6oAEePD5qVo0weIpzPvSHNCCX j7qNbaN4vdYwM4JYWUe/G7qshbBH1YvgxnRwsA228jixGaRwOO1z0kRmGd1JuVrvFk/F T8pw== X-Gm-Message-State: AOAM533JQmRU7f6ByQJo7nKUKofSIgG++fkcEWXvjGKNBfUm7zecB3ID uNJ6xHV1DMUvsqmZZsC33mCbryeV/YXLFq6c0fZ4eufpa7gwPRFNMnmmmLUD7pHseT77EH951lK wHU9n36nb8J1mrSpWCkpY/Ac= X-Received: by 2002:a5d:6549:: with SMTP id z9mr1223132wrv.420.1644397406033; Wed, 09 Feb 2022 01:03:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyAoxcw7jgi7SZI0lZuE3Ts1yz6KYfW12uWxaTagcv05Vtrjuw9CQlAfWSnk+ZHtktaUn1mg== X-Received: by 2002:a5d:6549:: with SMTP id z9mr1223114wrv.420.1644397405788; Wed, 09 Feb 2022 01:03:25 -0800 (PST) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id z1sm4058866wmk.32.2022.02.09.01.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 01:03:25 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Thomas Zimmermann , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Maxime Ripard , Geert Uytterhoeven , linux-fbdev@vger.kernel.org, Daniel Vetter , Sam Ravnborg , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , Maxime Ripard Subject: [PATCH v3 1/7] drm/format-helper: Add drm_fb_xrgb8888_to_gray8_line() Date: Wed, 9 Feb 2022 10:03:08 +0100 Message-Id: <20220209090314.2511959-2-javierm@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209090314.2511959-1-javierm@redhat.com> References: <20220209090314.2511959-1-javierm@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Pull the per-line conversion logic into a separate helper function. This will allow to do line-by-line conversion in other helpers that convert to a gray8 format. Suggested-by: Thomas Zimmermann Signed-off-by: Javier Martinez Canillas --- Changes in v3: - Add a drm_fb_xrgb8888_to_gray8_line() helper function (Thomas Zimmermann) drivers/gpu/drm/drm_format_helper.c | 31 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c index 0f28dd2bdd72..b981712623d3 100644 --- a/drivers/gpu/drm/drm_format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -464,6 +464,21 @@ void drm_fb_xrgb8888_to_xrgb2101010_toio(void __iomem *dst, } EXPORT_SYMBOL(drm_fb_xrgb8888_to_xrgb2101010_toio); +static void drm_fb_xrgb8888_to_gray8_line(u8 *dst, const u32 *src, unsigned int pixels) +{ + unsigned int x; + + for (x = 0; x < pixels; x++) { + u8 r = (*src & 0x00ff0000) >> 16; + u8 g = (*src & 0x0000ff00) >> 8; + u8 b = *src & 0x000000ff; + + /* ITU BT.601: Y = 0.299 R + 0.587 G + 0.114 B */ + *dst++ = (3 * r + 6 * g + b) / 10; + src++; + } +} + /** * drm_fb_xrgb8888_to_gray8 - Convert XRGB8888 to grayscale * @dst: 8-bit grayscale destination buffer @@ -484,8 +499,9 @@ EXPORT_SYMBOL(drm_fb_xrgb8888_to_xrgb2101010_toio); void drm_fb_xrgb8888_to_gray8(void *dst, unsigned int dst_pitch, const void *vaddr, const struct drm_framebuffer *fb, const struct drm_rect *clip) { - unsigned int len = (clip->x2 - clip->x1) * sizeof(u32); - unsigned int x, y; + unsigned int linepixels = clip->x2 - clip->x1; + unsigned int len = linepixels * sizeof(u32); + unsigned int y; void *buf; u8 *dst8; u32 *src32; @@ -508,16 +524,7 @@ void drm_fb_xrgb8888_to_gray8(void *dst, unsigned int dst_pitch, const void *vad for (y = clip->y1; y < clip->y2; y++) { dst8 = dst; src32 = memcpy(buf, vaddr, len); - for (x = clip->x1; x < clip->x2; x++) { - u8 r = (*src32 & 0x00ff0000) >> 16; - u8 g = (*src32 & 0x0000ff00) >> 8; - u8 b = *src32 & 0x000000ff; - - /* ITU BT.601: Y = 0.299 R + 0.587 G + 0.114 B */ - *dst8++ = (3 * r + 6 * g + b) / 10; - src32++; - } - + drm_fb_xrgb8888_to_gray8_line(dst8, src32, linepixels); vaddr += fb->pitches[0]; dst += dst_pitch; }