From: Louis Chauvet <louis.chauvet@bootlin.com>
To: "Rodrigo Siqueira" <rodrigosiqueiramelo@gmail.com>,
"Melissa Wen" <melissa.srw@gmail.com>,
"Maíra Canal" <mairacanal@riseup.net>,
"Haneen Mohammed" <hamohammed.sa@gmail.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Jonathan Corbet" <corbet@lwn.net>,
"Louis Chauvet" <louis.chauvet@bootlin.com>,
"Simona Vetter" <simona@ffwll.ch>,
rdunlap@infradead.org, arthurgrillo@riseup.net,
pekka.paalanen@haloniitty.fi,
"Simona Vetter" <simona.vetter@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org, thomas.petazzoni@bootlin.com,
jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com,
seanpaul@google.com, marcheu@google.com,
nicolejadeyee@google.com
Subject: [PATCH v12 07/15] drm/vkms: Introduce pixel_read_direction enum
Date: Mon, 07 Oct 2024 18:10:41 +0200 [thread overview]
Message-ID: <20241007-yuv-v12-7-01c1ada6fec8@bootlin.com> (raw)
In-Reply-To: <20241007-yuv-v12-0-01c1ada6fec8@bootlin.com>
The pixel_read_direction enum is useful to describe the reading direction
in a plane. It avoids using the rotation property of DRM, which not
practical to know the direction of reading.
This patch also introduce two helpers, one to compute the
pixel_read_direction from the DRM rotation property, and one to compute
the step, in byte, between two successive pixel in a specific direction.
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
drivers/gpu/drm/vkms/vkms_composer.c | 44 ++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/vkms/vkms_drv.h | 11 +++++++++
drivers/gpu/drm/vkms/vkms_formats.c | 32 ++++++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index ecac0bc858a0..601e33431b45 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -159,6 +159,50 @@ static void apply_lut(const struct vkms_crtc_state *crtc_state, struct line_buff
}
}
+/**
+ * direction_for_rotation() - Get the correct reading direction for a given rotation
+ *
+ * @rotation: Rotation to analyze. It correspond the field @frame_info.rotation.
+ *
+ * This function will use the @rotation setting of a source plane to compute the reading
+ * direction in this plane which correspond to a "left to right writing" in the CRTC.
+ * For example, if the buffer is reflected on X axis, the pixel must be read from right to left
+ * to be written from left to right on the CRTC.
+ */
+static enum pixel_read_direction direction_for_rotation(unsigned int rotation)
+{
+ struct drm_rect tmp_a, tmp_b;
+ int x, y;
+
+ /*
+ * Points A and B are depicted as zero-size rectangles on the CRTC.
+ * The CRTC writing direction is from A to B. The plane reading direction
+ * is discovered by inverse-transforming A and B.
+ * The reading direction is computed by rotating the vector AB (top-left to top-right) in a
+ * 1x1 square.
+ */
+
+ tmp_a = DRM_RECT_INIT(0, 0, 0, 0);
+ tmp_b = DRM_RECT_INIT(1, 0, 0, 0);
+ drm_rect_rotate_inv(&tmp_a, 1, 1, rotation);
+ drm_rect_rotate_inv(&tmp_b, 1, 1, rotation);
+
+ x = tmp_b.x1 - tmp_a.x1;
+ y = tmp_b.y1 - tmp_a.y1;
+
+ if (x == 1 && y == 0)
+ return READ_LEFT_TO_RIGHT;
+ else if (x == -1 && y == 0)
+ return READ_RIGHT_TO_LEFT;
+ else if (y == 1 && x == 0)
+ return READ_TOP_TO_BOTTOM;
+ else if (y == -1 && x == 0)
+ return READ_BOTTOM_TO_TOP;
+
+ WARN_ONCE(true, "The inverse of the rotation gives an incorrect direction.");
+ return READ_LEFT_TO_RIGHT;
+}
+
/**
* blend - blend the pixels from all planes and compute crc
* @wb: The writeback frame buffer metadata
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 3f45290a0c5d..777b7bd91f27 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -69,6 +69,17 @@ struct vkms_writeback_job {
pixel_write_t pixel_write;
};
+/**
+ * enum pixel_read_direction - Enum used internaly by VKMS to represent a reading direction in a
+ * plane.
+ */
+enum pixel_read_direction {
+ READ_BOTTOM_TO_TOP,
+ READ_TOP_TO_BOTTOM,
+ READ_RIGHT_TO_LEFT,
+ READ_LEFT_TO_RIGHT
+};
+
/**
* typedef pixel_read_t - These functions are used to read a pixel in the source frame,
* convert it to `struct pixel_argb_u16` and write it to @out_pixel.
diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c
index 7f932d42394d..d0e7dfc1f0d3 100644
--- a/drivers/gpu/drm/vkms/vkms_formats.c
+++ b/drivers/gpu/drm/vkms/vkms_formats.c
@@ -79,6 +79,38 @@ static void packed_pixels_addr(const struct vkms_frame_info *frame_info,
*addr = (u8 *)frame_info->map[0].vaddr + offset;
}
+/**
+ * get_block_step_bytes() - Common helper to compute the correct step value between each pixel block
+ * to read in a certain direction.
+ *
+ * @fb: Framebuffer to iter on
+ * @direction: Direction of the reading
+ * @plane_index: Plane to get the step from
+ *
+ * As the returned count is the number of bytes between two consecutive blocks in a direction,
+ * the caller may have to read multiple pixels before using the next one (for example, to read from
+ * left to right in a DRM_FORMAT_R1 plane, each block contains 8 pixels, so the step must be used
+ * only every 8 pixels).
+ */
+static int get_block_step_bytes(struct drm_framebuffer *fb, enum pixel_read_direction direction,
+ int plane_index)
+{
+ switch (direction) {
+ case READ_LEFT_TO_RIGHT:
+ return fb->format->char_per_block[plane_index];
+ case READ_RIGHT_TO_LEFT:
+ return -fb->format->char_per_block[plane_index];
+ case READ_TOP_TO_BOTTOM:
+ return (int)fb->pitches[plane_index] * drm_format_info_block_width(fb->format,
+ plane_index);
+ case READ_BOTTOM_TO_TOP:
+ return -(int)fb->pitches[plane_index] * drm_format_info_block_width(fb->format,
+ plane_index);
+ }
+
+ return 0;
+}
+
/**
* packed_pixels_addr_1x1() - Get the pointer to the block containing the pixel at the given
* coordinates
--
2.46.2
next prev parent reply other threads:[~2024-10-07 16:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 16:10 [PATCH v12 00/15] drm/vkms: Reimplement line-per-line pixel conversion for plane reading Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 01/15] drm/vkms: Code formatting Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 02/15] drm/vkms: Use drm_frame directly Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 03/15] drm/vkms: Add typedef and documentation for pixel_read and pixel_write functions Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 04/15] drm/vkms: Use const for input pointers in pixel_read an " Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 05/15] drm/vkms: Update pixels accessor to support packed and multi-plane formats Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 06/15] drm/vkms: Avoid computing blending limits inside pre_mul_alpha_blend Louis Chauvet
2024-10-07 16:10 ` Louis Chauvet [this message]
2024-10-07 16:10 ` [PATCH v12 08/15] drm/vkms: Re-introduce line-per-line composition algorithm Louis Chauvet
2024-10-26 14:26 ` Maíra Canal
2024-10-28 9:50 ` Louis Chauvet
2024-10-28 10:13 ` Maíra Canal
2024-10-07 16:10 ` [PATCH v12 09/15] drm/vkms: Remove useless drm_rotation_simplify Louis Chauvet
2024-10-11 9:36 ` Louis Chauvet
2024-10-11 13:53 ` Maira Canal
2024-10-11 14:14 ` Maxime Ripard
2024-10-14 8:39 ` Louis Chauvet
2024-10-26 12:10 ` Maíra Canal
2024-10-28 9:50 ` Louis Chauvet
2024-10-28 10:17 ` Maíra Canal
2024-10-28 11:01 ` Louis Chauvet
2024-10-28 19:31 ` Maíra Canal
2024-10-07 16:10 ` [PATCH v12 10/15] drm/vkms: Add YUV support Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 11/15] drm/vkms: Add range and encoding properties to the plane Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 12/15] drm/vkms: Drop YUV formats TODO Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 13/15] drm/vkms: Create KUnit tests for YUV conversions Louis Chauvet
2024-10-08 7:53 ` Maxime Ripard
2024-10-08 9:23 ` Louis Chauvet
2024-10-11 10:49 ` Maxime Ripard
2024-10-11 14:29 ` Louis Chauvet
2024-10-24 14:06 ` Maxime Ripard
2024-10-10 20:35 ` kernel test robot
2024-10-26 14:49 ` Maíra Canal
2024-10-28 9:50 ` Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 14/15] drm/vkms: Add how to run the Kunit tests Louis Chauvet
2024-10-07 16:10 ` [PATCH v12 15/15] drm/vkms: Add support for DRM_FORMAT_R* Louis Chauvet
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=20241007-yuv-v12-7-01c1ada6fec8@bootlin.com \
--to=louis.chauvet@bootlin.com \
--cc=airlied@gmail.com \
--cc=arthurgrillo@riseup.net \
--cc=corbet@lwn.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=jeremie.dautheribes@bootlin.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mairacanal@riseup.net \
--cc=marcheu@google.com \
--cc=melissa.srw@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=mripard@kernel.org \
--cc=nicolejadeyee@google.com \
--cc=pekka.paalanen@haloniitty.fi \
--cc=rdunlap@infradead.org \
--cc=rodrigosiqueiramelo@gmail.com \
--cc=seanpaul@google.com \
--cc=simona.vetter@ffwll.ch \
--cc=simona@ffwll.ch \
--cc=thomas.petazzoni@bootlin.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox