As stated in [2], the write_line functions are very similar and force code
duplication. This patch add a macro to avoid code repetition.
Signed-off-by: Louis Chauvet <louis.chauvet@xxxxxxxxxxx>
---
drivers/gpu/drm/vkms/vkms_formats.c | 107 ++++++++++------------------------
drivers/gpu/drm/vkms/vkms_writeback.c | 4 +-
2 files changed, 33 insertions(+), 78 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c
index c5cb2e45ddaf..51b1c04e6781 100644
--- a/drivers/gpu/drm/vkms/vkms_formats.c
+++ b/drivers/gpu/drm/vkms/vkms_formats.c
@@ -642,6 +642,31 @@ static void argb_u16_to_RGB565(u8 *out_pixel, const struct pixel_argb_u16 *in_pi
*pixel = cpu_to_le16(r << 11 | g << 5 | b);
}
+/**
+ * WRITE_LINE() - Generic generator for write_line functions
+ *
+ * This generator can only be used for format with only one plane and block_w == block_h == 1
+ *
+ * @function_name: Name to use for the generated function
+ * @conversion_function: Fonction to use for the conversion from argb_u16 to the required format.
+ */
+#define WRITE_LINE(function_name, conversion_function) \
+static void function_name(struct vkms_writeback_job *wb, \
+ struct pixel_argb_u16 *src_pixels, int count, int x_start, \
+ int y_start) \
+{ \
+ u8 *dst_pixels; \
+ \
+ packed_pixels_addr_1x1(&wb->wb_frame_info, x_start, y_start, 0, &dst_pixels); \
+ \
+ while (count) { \
+ (conversion_function)(dst_pixels, src_pixels); \
+ dst_pixels += wb->wb_frame_info.fb->format->char_per_block[0]; \
+ src_pixels += 1; \
+ count--; \
+ } \
+}
+
/*
* The following functions are write_line function for each pixel format supported by VKMS.
*
@@ -655,85 +680,13 @@ static void argb_u16_to_RGB565(u8 *out_pixel, const struct pixel_argb_u16 *in_pi
* [1]: https://lore.kernel.org/dri-devel/d258c8dc-78e9-4509-9037-a98f7f33b3a3@xxxxxxxxxx/
*/
-static void ARGB8888_write_line(struct vkms_writeback_job *wb,
- struct pixel_argb_u16 *src_pixels, int count, int x_start,
- int y_start)
-{
- u8 *dst_pixels;
+WRITE_LINE(ARGB8888_write_line, argb_u16_to_ARGB8888)
+WRITE_LINE(XRGB8888_write_line, argb_u16_to_XRGB8888)
- packed_pixels_addr_1x1(&wb->wb_frame_info, x_start, y_start, 0, &dst_pixels);
+WRITE_LINE(ARGB16161616_write_line, argb_u16_to_ARGB16161616)
+WRITE_LINE(XRGB16161616_write_line, argb_u16_to_XRGB16161616)
- while (count) {
- argb_u16_to_ARGB8888(dst_pixels, src_pixels);
- dst_pixels += wb->wb_frame_info.fb->format->char_per_block[0];
- src_pixels += 1;
- count--;
- }
-}
-
-static void XRGB8888_write_line(struct vkms_writeback_job *wb,
- struct pixel_argb_u16 *src_pixels, int count, int x_start,
- int y_start)
-{
- u8 *dst_pixels;
-
- packed_pixels_addr_1x1(&wb->wb_frame_info, x_start, y_start, 0, &dst_pixels);
-
- while (count) {
- argb_u16_to_XRGB8888(dst_pixels, src_pixels);
- dst_pixels += wb->wb_frame_info.fb->format->char_per_block[0];
- src_pixels += 1;
- count--;
- }
-}
-
-static void ARGB16161616_write_line(struct vkms_writeback_job *wb,
- struct pixel_argb_u16 *src_pixels, int count, int x_start,
- int y_start)
-{
- u8 *dst_pixels;
-
- packed_pixels_addr_1x1(&wb->wb_frame_info, x_start, y_start, 0, &dst_pixels);
-
- while (count) {
- argb_u16_to_ARGB16161616(dst_pixels, src_pixels);
- dst_pixels += wb->wb_frame_info.fb->format->char_per_block[0];
- src_pixels += 1;
- count--;
- }
-}
-
-static void XRGB16161616_write_line(struct vkms_writeback_job *wb,
- struct pixel_argb_u16 *src_pixels, int count, int x_start,
- int y_start)
-{
- u8 *dst_pixels;
-
- packed_pixels_addr_1x1(&wb->wb_frame_info, x_start, y_start, 0, &dst_pixels);
-
- while (count) {
- argb_u16_to_XRGB16161616(dst_pixels, src_pixels);
- dst_pixels += wb->wb_frame_info.fb->format->char_per_block[0];
- src_pixels += 1;
- count--;
- }
-}
-
-static void RGB565_write_line(struct vkms_writeback_job *wb,
- struct pixel_argb_u16 *src_pixels, int count, int x_start,
- int y_start)
-{
- u8 *dst_pixels;
-
- packed_pixels_addr_1x1(&wb->wb_frame_info, x_start, y_start, 0, &dst_pixels);
-
- while (count) {
- argb_u16_to_RGB565(dst_pixels, src_pixels);
- dst_pixels += wb->wb_frame_info.fb->format->char_per_block[0];
- src_pixels += 1;
- count--;
- }
-}
+WRITE_LINE(RGB565_write_line, argb_u16_to_RGB565)
/**
* argb_u16_to_nothing() - pixel_write callback with no effect
diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
index f6ed3aa69af8..53bddcf33eab 100644
--- a/drivers/gpu/drm/vkms/vkms_writeback.c
+++ b/drivers/gpu/drm/vkms/vkms_writeback.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+
#include <linux/iosys-map.h>
+#include <linux/media-bus-format.h>
#include <drm/drm_atomic.h>
#include <drm/drm_edid.h>
@@ -19,7 +20,8 @@ static const u32 vkms_wb_formats[] = {
DRM_FORMAT_XRGB8888,
DRM_FORMAT_XRGB16161616,
DRM_FORMAT_ARGB16161616,
- DRM_FORMAT_RGB565
+ DRM_FORMAT_RGB565,
+ DRM_FORMAT_YUV422
};
static const struct drm_connector_funcs vkms_wb_connector_funcs = {
--
2.43.2
