From: Javier Martinez Canillas <javierm@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-fbdev@vger.kernel.org, "Geert Uytterhoeven" <geert@linux-m68k.org>, "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>, "Maxime Ripard" <maxime@cerno.tech>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org, "Thomas Zimmermann" <tzimmermann@suse.de>, "Sam Ravnborg" <sam@ravnborg.org>, "Noralf Trønnes" <noralf@tronnes.org>, "Javier Martinez Canillas" <javierm@redhat.com>, "Daniel Vetter" <daniel@ffwll.ch>, "David Airlie" <airlied@linux.ie>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Maxime Ripard" <mripard@kernel.org> Subject: [PATCH v4 1/6] drm/format-helper: Add drm_fb_xrgb8888_to_gray8_line() Date: Fri, 11 Feb 2022 10:19:22 +0100 [thread overview] Message-ID: <20220211091927.2988283-2-javierm@redhat.com> (raw) In-Reply-To: <20220211091927.2988283-1-javierm@redhat.com> 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 <tzimmermann@suse.de> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> --- (no changes since v3) 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; } -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Javier Martinez Canillas <javierm@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-fbdev@vger.kernel.org, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Javier Martinez Canillas" <javierm@redhat.com>, dri-devel@lists.freedesktop.org, "Noralf Trønnes" <noralf@tronnes.org>, "Geert Uytterhoeven" <geert@linux-m68k.org>, "Maxime Ripard" <maxime@cerno.tech>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>, "Sam Ravnborg" <sam@ravnborg.org> Subject: [PATCH v4 1/6] drm/format-helper: Add drm_fb_xrgb8888_to_gray8_line() Date: Fri, 11 Feb 2022 10:19:22 +0100 [thread overview] Message-ID: <20220211091927.2988283-2-javierm@redhat.com> (raw) In-Reply-To: <20220211091927.2988283-1-javierm@redhat.com> 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 <tzimmermann@suse.de> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> --- (no changes since v3) 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; } -- 2.34.1
next prev parent reply other threads:[~2022-02-11 9:19 UTC|newest] Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-11 9:19 [PATCH v4 0/6] drm: Add driver for Solomon SSD130x OLED displays Javier Martinez Canillas 2022-02-11 9:19 ` Javier Martinez Canillas 2022-02-11 9:19 ` Javier Martinez Canillas [this message] 2022-02-11 9:19 ` [PATCH v4 1/6] drm/format-helper: Add drm_fb_xrgb8888_to_gray8_line() Javier Martinez Canillas 2022-02-11 9:29 ` Thomas Zimmermann 2022-02-11 10:28 ` Andy Shevchenko 2022-02-11 10:28 ` Andy Shevchenko 2022-02-11 10:40 ` Javier Martinez Canillas 2022-02-11 10:40 ` Javier Martinez Canillas 2022-02-11 11:12 ` Andy Shevchenko 2022-02-11 11:12 ` Andy Shevchenko 2022-02-11 11:54 ` Thomas Zimmermann 2022-02-11 11:54 ` Thomas Zimmermann 2022-02-11 12:05 ` Jani Nikula 2022-02-11 12:11 ` Javier Martinez Canillas 2022-02-11 12:27 ` Geert Uytterhoeven 2022-02-11 12:27 ` Geert Uytterhoeven 2022-02-11 15:41 ` Andy Shevchenko 2022-02-11 15:41 ` Andy Shevchenko 2022-02-11 16:25 ` Jani Nikula 2022-02-11 16:25 ` Jani Nikula 2022-02-11 17:27 ` Andy Shevchenko 2022-02-11 17:27 ` Andy Shevchenko 2022-02-14 9:17 ` Pekka Paalanen 2022-02-14 9:17 ` Pekka Paalanen 2022-02-14 10:26 ` Andy Shevchenko 2022-02-14 10:26 ` Andy Shevchenko 2022-02-14 9:03 ` Thomas Zimmermann 2022-02-14 9:03 ` Thomas Zimmermann 2022-02-14 10:38 ` Andy Shevchenko 2022-02-14 10:38 ` Andy Shevchenko 2022-02-14 10:52 ` Simon Ser 2022-02-14 10:52 ` Simon Ser 2022-02-14 10:57 ` Geert Uytterhoeven 2022-02-14 10:57 ` Geert Uytterhoeven 2022-02-14 12:12 ` Thomas Zimmermann 2022-02-14 12:12 ` Thomas Zimmermann 2022-02-14 12:47 ` Ville Syrjälä 2022-02-14 12:47 ` Ville Syrjälä 2022-02-14 12:54 ` Thomas Zimmermann 2022-02-14 13:07 ` Ville Syrjälä 2022-02-14 13:59 ` Andy Shevchenko 2022-02-14 13:59 ` Andy Shevchenko 2022-02-11 9:19 ` [PATCH v4 2/6] drm/format-helper: Add drm_fb_xrgb8888_to_mono_reversed() Javier Martinez Canillas 2022-02-11 9:19 ` Javier Martinez Canillas 2022-02-11 11:10 ` Andy Shevchenko 2022-02-11 11:10 ` Andy Shevchenko 2022-02-11 11:50 ` Javier Martinez Canillas 2022-02-11 11:50 ` Javier Martinez Canillas 2022-02-11 15:55 ` Andy Shevchenko 2022-02-11 15:55 ` Andy Shevchenko 2022-02-11 11:59 ` Thomas Zimmermann 2022-02-11 11:59 ` Thomas Zimmermann 2022-02-11 12:46 ` Thomas Zimmermann 2022-02-11 12:46 ` Thomas Zimmermann 2022-02-11 9:19 ` [PATCH v4 3/6] drm: Add driver for Solomon SSD130x OLED displays Javier Martinez Canillas 2022-02-11 9:19 ` Javier Martinez Canillas 2022-02-11 11:33 ` Andy Shevchenko 2022-02-11 11:33 ` Andy Shevchenko 2022-02-11 12:05 ` Javier Martinez Canillas 2022-02-11 12:05 ` Javier Martinez Canillas 2022-02-11 12:23 ` Geert Uytterhoeven 2022-02-11 12:23 ` Geert Uytterhoeven 2022-02-11 12:27 ` Javier Martinez Canillas 2022-02-11 12:27 ` Javier Martinez Canillas 2022-02-11 15:49 ` Andy Shevchenko 2022-02-11 15:49 ` Andy Shevchenko 2022-02-11 12:44 ` Thomas Zimmermann 2022-02-11 12:44 ` Thomas Zimmermann 2022-02-11 9:19 ` [PATCH v4 4/6] drm/solomon: Add SSD130x OLED displays I2C support Javier Martinez Canillas 2022-02-11 9:19 ` Javier Martinez Canillas 2022-02-11 11:16 ` Andy Shevchenko 2022-02-11 11:16 ` Andy Shevchenko 2022-02-11 9:21 ` [PATCH v4 5/6] MAINTAINERS: Add entry for Solomon SSD130x OLED displays DRM driver Javier Martinez Canillas 2022-02-11 9:21 ` Javier Martinez Canillas 2022-02-11 11:34 ` Andy Shevchenko 2022-02-11 11:34 ` Andy Shevchenko 2022-02-11 9:22 ` [PATCH v4 6/6] dt-bindings: display: ssd1307fb: Add myself as binding co-maintainer Javier Martinez Canillas 2022-02-11 9:22 ` Javier Martinez Canillas 2022-02-11 11:35 ` Andy Shevchenko 2022-02-11 11:35 ` Andy Shevchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220211091927.2988283-2-javierm@redhat.com \ --to=javierm@redhat.com \ --cc=airlied@linux.ie \ --cc=andriy.shevchenko@linux.intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=geert@linux-m68k.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=maxime@cerno.tech \ --cc=mripard@kernel.org \ --cc=noralf@tronnes.org \ --cc=sam@ravnborg.org \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.