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>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
rdunlap@infradead.org, arthurgrillo@riseup.net,
"Jonathan Corbet" <corbet@lwn.net>,
pekka.paalanen@haloniitty.fi
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com,
thomas.petazzoni@bootlin.com, seanpaul@google.com,
marcheu@google.com, nicolejadeyee@google.com,
Louis Chauvet <louis.chauvet@bootlin.com>,
Pekka Paalanen <pekka.paalanen@collabora.com>
Subject: [PATCH v6 05/17] drm/vkms: Add dummy pixel_read/pixel_write callbacks to avoid NULL pointers
Date: Tue, 09 Apr 2024 15:25:23 +0200 [thread overview]
Message-ID: <20240409-yuv-v6-5-de1c5728fd70@bootlin.com> (raw)
In-Reply-To: <20240409-yuv-v6-0-de1c5728fd70@bootlin.com>
Introduce two callbacks which does nothing. They are used in replacement
of NULL and it avoid kernel OOPS if this NULL is called.
If those callback are used, it means that there is a mismatch between
what formats are announced by atomic_check and what is realy supported by
atomic_update.
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
drivers/gpu/drm/vkms/vkms_formats.c | 45 ++++++++++++++++++++++++++++++++-----
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c
index 6b3e17374b19..c28c32b00e39 100644
--- a/drivers/gpu/drm/vkms/vkms_formats.c
+++ b/drivers/gpu/drm/vkms/vkms_formats.c
@@ -135,6 +135,21 @@ static void RGB565_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_pixel)
out_pixel->b = drm_fixp2int_round(drm_fixp_mul(fp_b, fp_rb_ratio));
}
+/**
+ * magenta_to_argb_u16() - pixel_read callback which always read magenta
+ *
+ * This callback is used when an invalid format is requested for plane reading.
+ * It is used to avoid null pointer to be used as a function. In theory, this function should
+ * never be called, except if you found a bug in the driver/DRM core.
+ */
+static void magenta_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_pixel)
+{
+ out_pixel->a = (u16)0xFFFF;
+ out_pixel->r = (u16)0xFFFF;
+ out_pixel->g = 0;
+ out_pixel->b = (u16)0xFFFF;
+}
+
/**
* vkms_compose_row - compose a single row of a plane
* @stage_buffer: output line with the composed pixels
@@ -237,6 +252,16 @@ static void argb_u16_to_RGB565(u8 *out_pixel, struct pixel_argb_u16 *in_pixel)
*pixel = cpu_to_le16(r << 11 | g << 5 | b);
}
+/**
+ * argb_u16_to_nothing() - pixel_write callback with no effect
+ *
+ * This callback is used when an invalid format is requested for writeback.
+ * It is used to avoid null pointer to be used as a function. In theory, this should never
+ * happen, except if there is a bug in the driver
+ */
+static void argb_u16_to_nothing(u8 *out_pixel, struct pixel_argb_u16 *in_pixel)
+{}
+
/**
* vkms_writeback_row() - Generic loop for all supported writeback format. It is executed just
* after the blending to write a line in the writeback buffer.
@@ -260,8 +285,10 @@ void vkms_writeback_row(struct vkms_writeback_job *wb,
/**
* get_pixel_conversion_function() - Retrieve the correct read_pixel function for a specific
- * format. The returned pointer is NULL for unsupported pixel formats. The caller must ensure that
- * the pointer is valid before using it in a vkms_plane_state.
+ * format.
+ *
+ * If the format is not supported by VKMS a warning is emitted and a dummy "always read magenta"
+ * function is returned.
*
* @format: DRM_FORMAT_* value for which to obtain a conversion function (see [drm_fourcc.h])
*/
@@ -284,18 +311,21 @@ pixel_read_t get_pixel_read_function(u32 format)
* format must:
* - Be listed in vkms_formats in vkms_plane.c
* - Have a pixel_read callback defined here
+ *
+ * To avoid kernel crash, a dummy "always read magenta" function is used. It means
+ * that during the composition, this plane will always be magenta.
*/
WARN(true,
"Pixel format %p4cc is not supported by VKMS planes. This is a kernel bug, atomic check must forbid this configuration.\n",
&format);
- return (pixel_read_t)NULL;
+ return &magenta_to_argb_u16;
}
}
/**
* get_pixel_write_function() - Retrieve the correct write_pixel function for a specific format.
- * The returned pointer is NULL for unsupported pixel formats. The caller must ensure that the
- * pointer is valid before using it in a vkms_writeback_job.
+ * If the format is not supported by VKMS a warning is emitted and a dummy "don't do anything"
+ * function is returned.
*
* @format: DRM_FORMAT_* value for which to obtain a conversion function (see [drm_fourcc.h])
*/
@@ -318,10 +348,13 @@ pixel_write_t get_pixel_write_function(u32 format)
* format must:
* - Be listed in vkms_wb_formats in vkms_writeback.c
* - Have a pixel_write callback defined here
+ *
+ * To avoid kernel crash, a dummy "don't do anything" function is used. It means
+ * that the resulting writeback buffer is not composed and can contains any values.
*/
WARN(true,
"Pixel format %p4cc is not supported by VKMS writeback. This is a kernel bug, atomic check must forbid this configuration.\n",
&format);
- return (pixel_write_t)NULL;
+ return &argb_u16_to_nothing;
}
}
--
2.43.0
next prev parent reply other threads:[~2024-04-09 13:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 13:25 [PATCH v6 00/17] drm/vkms: Reimplement line-per-line pixel conversion for plane reading Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 01/17] drm/vkms: Code formatting Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 02/17] drm/vkms: Use drm_frame directly Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 03/17] drm/vkms: write/update the documentation for pixel conversion and pixel write functions Louis Chauvet
2024-04-22 10:33 ` Pekka Paalanen
2024-05-13 6:31 ` Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 04/17] drm/vkms: Add typedef and documentation for pixel_read and pixel_write functions Louis Chauvet
2024-04-09 13:25 ` Louis Chauvet [this message]
2024-04-09 13:25 ` [PATCH v6 06/17] drm/vkms: Use const for input pointers in pixel_read an " Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 07/17] drm/vkms: Update pixels accessor to support packed and multi-plane formats Louis Chauvet
2024-04-22 11:07 ` Pekka Paalanen
2024-05-13 7:15 ` Louis Chauvet
2024-05-13 11:14 ` Pekka Paalanen
2024-04-09 13:25 ` [PATCH v6 08/17] drm/vkms: Avoid computing blending limits inside pre_mul_alpha_blend Louis Chauvet
2024-04-22 11:12 ` Pekka Paalanen
2024-04-09 13:25 ` [PATCH v6 09/17] drm/vkms: Introduce pixel_read_direction enum Louis Chauvet
2024-04-22 11:39 ` Pekka Paalanen
2024-05-13 7:15 ` Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 10/17] drm/vkms: Re-introduce line-per-line composition algorithm Louis Chauvet
2024-04-22 12:38 ` Pekka Paalanen
2024-04-09 13:25 ` [PATCH v6 11/17] drm/vkms: Remove useless drm_rotation_simplify Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 12/17] drm/vkms: Add YUV support Louis Chauvet
2024-04-22 14:47 ` Pekka Paalanen
2024-04-09 13:25 ` [PATCH v6 13/17] drm/vkms: Add range and encoding properties to the plane Louis Chauvet
2024-04-22 14:49 ` Pekka Paalanen
2024-04-09 13:25 ` [PATCH v6 14/17] drm/vkms: Drop YUV formats TODO Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 15/17] drm/vkms: Create KUnit tests for YUV conversions Louis Chauvet
2024-04-23 13:29 ` Pekka Paalanen
2024-04-09 13:25 ` [PATCH v6 16/17] drm/vkms: Add how to run the Kunit tests Louis Chauvet
2024-04-09 13:25 ` [PATCH v6 17/17] drm/vkms: Add support for DRM_FORMAT_R* Louis Chauvet
2024-04-23 14:26 ` Pekka Paalanen
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=20240409-yuv-v6-5-de1c5728fd70@bootlin.com \
--to=louis.chauvet@bootlin.com \
--cc=airlied@gmail.com \
--cc=arthurgrillo@riseup.net \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=jeremie.dautheribes@bootlin.com \
--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@collabora.com \
--cc=pekka.paalanen@haloniitty.fi \
--cc=rdunlap@infradead.org \
--cc=rodrigosiqueiramelo@gmail.com \
--cc=seanpaul@google.com \
--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 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.