From: Louis Chauvet <louis.chauvet@bootlin.com>
To: Leandro Ribeiro <leandro.ribeiro@collabora.com>
Cc: airlied@gmail.com, alex.hung@amd.com, daniel@fooishbar.org,
hamohammed.sa@gmail.com, harry.wentland@amd.com,
maarten.lankhorst@linux.intel.com, melissa.srw@gmail.com,
mripard@kernel.org, pekka.paalanen@collabora.com,
robert.mader@collabora.com, simona@ffwll.ch, tzimmermann@suse.de,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 06/12] drm/vkms: improve the way in which we access LUT member
Date: Wed, 18 Nov 2026 15:43:42 +0100 [thread overview]
Message-ID: <929e5bb7-2ace-4ad1-b154-e8c36a56f3a8@bootlin.com> (raw)
In-Reply-To: <20261106201813.129911-7-leandro.ribeiro@collabora.com>
On 11/6/26 21:18, Leandro Ribeiro wrote:
> apply_lut_to_channel_value() indexes a struct drm_color_lut array, and
> then cast to (__u16 *) and index with the channel (r -> index 0, g ->
> index 1, b -> index 2). This is a bit fragile and prone to issues.
>
> Instead, add a more robust helper lut_channel_value() such that, given a
> struct drm_color_lut and a color channel, it retrives the value.
>
> Reviewed-by: Robert Mader <robert.mader@collabora.com>
> Tested-by: Robert Mader <robert.mader@collabora.com>
> Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
> ---
> drivers/gpu/drm/vkms/vkms_composer.c | 30 ++++++++++++++++++++++------
> 1 file changed, 24 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
> index 0fc915a954ba..b4a433be1b2d 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.c
> +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> @@ -75,6 +75,24 @@ VISIBLE_IF_KUNIT u16 lerp_u16(u16 a, u16 b, s64 t)
> }
> EXPORT_SYMBOL_IF_KUNIT(lerp_u16);
>
> +static inline u16 lut_channel_value(const struct drm_color_lut *lut,
> + enum lut_channel channel)
> +{
> + switch (channel) {
> + case LUT_RED:
> + return lut->red;
> + case LUT_BLUE:
> + return lut->blue;
> + case LUT_GREEN:
> + return lut->green;
> + case LUT_RESERVED:
> + DRM_DEBUG_DRIVER("LUT_RESERVED channel should not be accessed");
> + return 0;
> + }
> + DRM_DEBUG_DRIVER("unknown LUT channel");
> + return 0;
> +}
> +
> VISIBLE_IF_KUNIT s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value)
> {
> s64 color_channel_fp = drm_int2fixp(channel_value);
> @@ -86,8 +104,8 @@ EXPORT_SYMBOL_IF_KUNIT(get_lut_index);
> VISIBLE_IF_KUNIT u16 apply_lut_to_channel_value(const struct vkms_color_lut *lut, u16 channel_value,
> enum lut_channel channel)
> {
> + const struct drm_color_lut *lut_y_floor, *lut_y_ceil;
> s64 lut_index = get_lut_index(lut, channel_value);
> - u16 *floor_lut_value, *ceil_lut_value;
> u16 floor_channel_value, ceil_channel_value;
>
> /*
> @@ -96,15 +114,15 @@ VISIBLE_IF_KUNIT u16 apply_lut_to_channel_value(const struct vkms_color_lut *lut
> */
> static_assert(sizeof(struct drm_color_lut) == sizeof(__u16) * 4);
>
> - floor_lut_value = (__u16 *)&lut->base[drm_fixp2int(lut_index)];
> + lut_y_floor = &lut->base[drm_fixp2int(lut_index)];
> if (drm_fixp2int(lut_index) == (lut->lut_length - 1))
> /* We're at the end of the LUT array, use same value for ceil and floor */
> - ceil_lut_value = floor_lut_value;
> + lut_y_ceil = lut_y_floor;
> else
> - ceil_lut_value = (__u16 *)&lut->base[drm_fixp2int_ceil(lut_index)];
> + lut_y_ceil = &lut->base[drm_fixp2int_ceil(lut_index)];
>
> - floor_channel_value = floor_lut_value[channel];
> - ceil_channel_value = ceil_lut_value[channel];
> + floor_channel_value = lut_channel_value(lut_y_floor, channel);
> + ceil_channel_value = lut_channel_value(lut_y_ceil, channel);
>
> return lerp_u16(floor_channel_value, ceil_channel_value,
> lut_index & DRM_FIXED_DECIMAL_MASK);
next prev parent reply other threads:[~2026-11-18 14:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-06 20:18 [PATCH v2 00/12] drm/vkms: improve color curve LUTs precision Leandro Ribeiro
2026-11-06 20:18 ` [PATCH v2 01/12] drm/vkms: rename VKMS_LUT_SIZE to VKMS_GAMMA_LUT_SIZE Leandro Ribeiro
2026-11-18 14:30 ` Louis Chauvet
2026-11-06 20:18 ` [PATCH v2 02/12] vkms: properly compute gamma LUT size in vkms_atomic_check() Leandro Ribeiro
2026-11-18 14:31 ` Louis Chauvet
2026-11-06 20:18 ` [PATCH v2 03/12] drm/vkms: allow color curve LUTs to have different sizes Leandro Ribeiro
2026-11-18 14:32 ` Louis Chauvet
2026-11-06 20:18 ` [PATCH v2 04/12] drm/vkms: remove TEST_LUT_SIZE Leandro Ribeiro
2026-11-18 14:37 ` Louis Chauvet
2026-11-06 20:18 ` [PATCH v2 05/12] drm/vkms: remove linear_eotf Leandro Ribeiro
2026-11-18 14:39 ` Louis Chauvet
2026-11-06 20:18 ` [PATCH v2 06/12] drm/vkms: improve the way in which we access LUT member Leandro Ribeiro
2026-11-18 14:43 ` Louis Chauvet [this message]
2026-11-06 20:18 ` [PATCH v2 07/12] drm/vkms: rename struct vkms_color_lut::base to y Leandro Ribeiro
2026-11-18 14:44 ` Louis Chauvet
2026-11-06 20:18 ` [PATCH v2 08/12] drm/vkms: rename get_lut_index() to get_uniform_lut_index() Leandro Ribeiro
2026-11-18 14:44 ` Louis Chauvet
2026-11-06 20:18 ` [PATCH v2 09/12] drm/vkms: add support to non-uniform LUT for internal color curves Leandro Ribeiro
2026-11-06 20:18 ` [PATCH v2 10/12] drm/vkms: test sRGB and inverse sRGB LUTs using more samples Leandro Ribeiro
2026-11-06 20:18 ` [PATCH v2 11/12] drm/vkms: add script to create optimized LUTs for color curves Leandro Ribeiro
2026-11-06 20:18 ` [PATCH v2 12/12] drm/vkms: replace uniform sRGB LUT and its inverse with optimal ones Leandro Ribeiro
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=929e5bb7-2ace-4ad1-b154-e8c36a56f3a8@bootlin.com \
--to=louis.chauvet@bootlin.com \
--cc=airlied@gmail.com \
--cc=alex.hung@amd.com \
--cc=daniel@fooishbar.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=harry.wentland@amd.com \
--cc=leandro.ribeiro@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=melissa.srw@gmail.com \
--cc=mripard@kernel.org \
--cc=pekka.paalanen@collabora.com \
--cc=robert.mader@collabora.com \
--cc=simona@ffwll.ch \
--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
all inboxes | Powered by JetHome®