OSDN Git Service

drm: move tinydrm format conversion helpers to new drm_format_helper.c
authorGerd Hoffmann <kraxel@redhat.com>
Fri, 5 Apr 2019 09:52:15 +0000 (11:52 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 8 Apr 2019 04:59:26 +0000 (06:59 +0200)
Also rename them from tinydrm_* to drm_fb_*
Pure code motion, no functional change.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190405095219.9231-2-kraxel@redhat.com
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_format_helper.c [new file with mode: 0644]
drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
drivers/gpu/drm/tinydrm/mipi-dbi.c
drivers/gpu/drm/tinydrm/repaper.c
drivers/gpu/drm/tinydrm/st7586.c
include/drm/drm_format_helper.h [new file with mode: 0644]
include/drm/tinydrm/tinydrm-helpers.h

index 38a9781..55d8deb 100644 (file)
@@ -38,7 +38,8 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper
                drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
                drm_simple_kms_helper.o drm_modeset_helper.o \
                drm_scdc_helper.o drm_gem_framebuffer_helper.o \
-               drm_atomic_state_helper.o drm_damage_helper.o
+               drm_atomic_state_helper.o drm_damage_helper.o \
+               drm_format_helper.o
 
 drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
 drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
new file mode 100644 (file)
index 0000000..62bb491
--- /dev/null
@@ -0,0 +1,180 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2016 Noralf Trønnes
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+
+#include <drm/drm_format_helper.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_rect.h>
+
+/**
+ * drm_fb_memcpy - Copy clip buffer
+ * @dst: Destination buffer
+ * @vaddr: Source buffer
+ * @fb: DRM framebuffer
+ * @clip: Clip rectangle area to copy
+ */
+void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
+                  struct drm_rect *clip)
+{
+       unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0);
+       unsigned int pitch = fb->pitches[0];
+       void *src = vaddr + (clip->y1 * pitch) + (clip->x1 * cpp);
+       size_t len = (clip->x2 - clip->x1) * cpp;
+       unsigned int y;
+
+       for (y = clip->y1; y < clip->y2; y++) {
+               memcpy(dst, src, len);
+               src += pitch;
+               dst += len;
+       }
+}
+EXPORT_SYMBOL(drm_fb_memcpy);
+
+/**
+ * drm_fb_swab16 - Swap bytes into clip buffer
+ * @dst: RGB565 destination buffer
+ * @vaddr: RGB565 source buffer
+ * @fb: DRM framebuffer
+ * @clip: Clip rectangle area to copy
+ */
+void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,
+                  struct drm_rect *clip)
+{
+       size_t len = (clip->x2 - clip->x1) * sizeof(u16);
+       unsigned int x, y;
+       u16 *src, *buf;
+
+       /*
+        * 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++)
+                       *dst++ = swab16(*src++);
+       }
+
+       kfree(buf);
+}
+EXPORT_SYMBOL(drm_fb_swab16);
+
+/**
+ * drm_fb_xrgb8888_to_rgb565 - Convert XRGB8888 to RGB565 clip buffer
+ * @dst: RGB565 destination buffer
+ * @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.
+ */
+void drm_fb_xrgb8888_to_rgb565(u16 *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;
+
+       /*
+        * 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);
+}
+EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
+
+/**
+ * drm_fb_xrgb8888_to_gray8 - Convert XRGB8888 to grayscale
+ * @dst: 8-bit grayscale destination buffer
+ * @vaddr: XRGB8888 source buffer
+ * @fb: DRM framebuffer
+ * @clip: Clip rectangle area to copy
+ *
+ * Drm doesn't have native monochrome or grayscale support.
+ * Such drivers can announce the commonly supported XR24 format to userspace
+ * and use this function to convert to the native format.
+ *
+ * Monochrome drivers will use the most significant bit,
+ * where 1 means foreground color and 0 background color.
+ *
+ * ITU BT.601 is used for the RGB -> luma (brightness) conversion.
+ */
+void drm_fb_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb,
+                              struct drm_rect *clip)
+{
+       unsigned int len = (clip->x2 - clip->x1) * sizeof(u32);
+       unsigned int x, y;
+       void *buf;
+       u32 *src;
+
+       if (WARN_ON(fb->format->format != DRM_FORMAT_XRGB8888))
+               return;
+       /*
+        * 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++) {
+                       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++;
+               }
+       }
+
+       kfree(buf);
+}
+EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8);
+
index d7b38df..6d540d9 100644 (file)
@@ -26,164 +26,6 @@ static unsigned int spi_max;
 module_param(spi_max, uint, 0400);
 MODULE_PARM_DESC(spi_max, "Set a lower SPI max transfer size");
 
-/**
- * tinydrm_memcpy - Copy clip buffer
- * @dst: Destination buffer
- * @vaddr: Source buffer
- * @fb: DRM framebuffer
- * @clip: Clip rectangle area to copy
- */
-void tinydrm_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
-                   struct drm_rect *clip)
-{
-       unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0);
-       unsigned int pitch = fb->pitches[0];
-       void *src = vaddr + (clip->y1 * pitch) + (clip->x1 * cpp);
-       size_t len = (clip->x2 - clip->x1) * cpp;
-       unsigned int y;
-
-       for (y = clip->y1; y < clip->y2; y++) {
-               memcpy(dst, src, len);
-               src += pitch;
-               dst += len;
-       }
-}
-EXPORT_SYMBOL(tinydrm_memcpy);
-
-/**
- * tinydrm_swab16 - Swap bytes into clip buffer
- * @dst: RGB565 destination buffer
- * @vaddr: RGB565 source buffer
- * @fb: DRM framebuffer
- * @clip: Clip rectangle area to copy
- */
-void tinydrm_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,
-                   struct drm_rect *clip)
-{
-       size_t len = (clip->x2 - clip->x1) * sizeof(u16);
-       unsigned int x, y;
-       u16 *src, *buf;
-
-       /*
-        * 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++)
-                       *dst++ = swab16(*src++);
-       }
-
-       kfree(buf);
-}
-EXPORT_SYMBOL(tinydrm_swab16);
-
-/**
- * tinydrm_xrgb8888_to_rgb565 - Convert XRGB8888 to RGB565 clip buffer
- * @dst: RGB565 destination buffer
- * @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.
- */
-void tinydrm_xrgb8888_to_rgb565(u16 *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;
-
-       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);
-}
-EXPORT_SYMBOL(tinydrm_xrgb8888_to_rgb565);
-
-/**
- * tinydrm_xrgb8888_to_gray8 - Convert XRGB8888 to grayscale
- * @dst: 8-bit grayscale destination buffer
- * @vaddr: XRGB8888 source buffer
- * @fb: DRM framebuffer
- * @clip: Clip rectangle area to copy
- *
- * Drm doesn't have native monochrome or grayscale support.
- * Such drivers can announce the commonly supported XR24 format to userspace
- * and use this function to convert to the native format.
- *
- * Monochrome drivers will use the most significant bit,
- * where 1 means foreground color and 0 background color.
- *
- * ITU BT.601 is used for the RGB -> luma (brightness) conversion.
- */
-void tinydrm_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb,
-                              struct drm_rect *clip)
-{
-       unsigned int len = (clip->x2 - clip->x1) * sizeof(u32);
-       unsigned int x, y;
-       void *buf;
-       u32 *src;
-
-       if (WARN_ON(fb->format->format != DRM_FORMAT_XRGB8888))
-               return;
-       /*
-        * 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++) {
-                       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++;
-               }
-       }
-
-       kfree(buf);
-}
-EXPORT_SYMBOL(tinydrm_xrgb8888_to_gray8);
-
 #if IS_ENABLED(CONFIG_SPI)
 
 /**
index 869c8f5..85761b4 100644 (file)
@@ -21,6 +21,7 @@
 #include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_format_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_vblank.h>
@@ -218,12 +219,12 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
        switch (fb->format->format) {
        case DRM_FORMAT_RGB565:
                if (swap)
-                       tinydrm_swab16(dst, src, fb, clip);
+                       drm_fb_swab16(dst, src, fb, clip);
                else
-                       tinydrm_memcpy(dst, src, fb, clip);
+                       drm_fb_memcpy(dst, src, fb, clip);
                break;
        case DRM_FORMAT_XRGB8888:
-               tinydrm_xrgb8888_to_rgb565(dst, src, fb, clip, swap);
+               drm_fb_xrgb8888_to_rgb565(dst, src, fb, clip, swap);
                break;
        default:
                dev_err_once(fb->dev->dev, "Format is not supported: %s\n",
index 3f36324..a29b827 100644 (file)
@@ -31,6 +31,7 @@
 #include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_format_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_rect.h>
@@ -566,7 +567,7 @@ static int repaper_fb_dirty(struct drm_framebuffer *fb)
                        goto out_free;
        }
 
-       tinydrm_xrgb8888_to_gray8(buf, cma_obj->vaddr, fb, &clip);
+       drm_fb_xrgb8888_to_gray8(buf, cma_obj->vaddr, fb, &clip);
 
        if (import_attach) {
                ret = dma_buf_end_cpu_access(import_attach->dmabuf,
index d99957b..560d7ac 100644 (file)
@@ -22,6 +22,7 @@
 #include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_format_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_rect.h>
@@ -77,7 +78,7 @@ static void st7586_xrgb8888_to_gray332(u8 *dst, void *vaddr,
        if (!buf)
                return;
 
-       tinydrm_xrgb8888_to_gray8(buf, vaddr, fb, clip);
+       drm_fb_xrgb8888_to_gray8(buf, vaddr, fb, clip);
        src = buf;
 
        for (y = clip->y1; y < clip->y2; y++) {
diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
new file mode 100644 (file)
index 0000000..5a7ada6
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2016 Noralf Trønnes
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __LINUX_DRM_FORMAT_HELPER_H
+#define __LINUX_DRM_FORMAT_HELPER_H
+
+struct drm_framebuffer;
+struct drm_rect;
+
+void drm_fb_memcpy(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,
+                              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);
+
+#endif /* __LINUX_DRM_FORMAT_HELPER_H */
index ae4a6ab..7d259ac 100644 (file)
@@ -46,16 +46,6 @@ int tinydrm_display_pipe_init(struct drm_device *drm,
                              const struct drm_display_mode *mode,
                              unsigned int rotation);
 
-void tinydrm_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
-                   struct drm_rect *clip);
-void tinydrm_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,
-                   struct drm_rect *clip);
-void tinydrm_xrgb8888_to_rgb565(u16 *dst, void *vaddr,
-                               struct drm_framebuffer *fb,
-                               struct drm_rect *clip, bool swap);
-void tinydrm_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb,
-                              struct drm_rect *clip);
-
 size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len);
 bool tinydrm_spi_bpw_supported(struct spi_device *spi, u8 bpw);
 int tinydrm_spi_transfer(struct spi_device *spi, u32 speed_hz,