From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35A764C77A7 for ; Tue, 4 Aug 2026 20:35:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785875759; cv=none; b=EUNuh1ddL8tMS6f0Wu3dN248W+IGTCYWYfYmIUXT9QvvLxFepo1jnATWuNAEJqQhONXbmYq1YDiOc1D/3ukHgg0hC43wgf+KzgmWL0V1redXPG436gPFs/QwG/Zi5grei65C+UpiXl7cUQVZIsI4a3k1+ywuXRU4QmpY2N1q4Yc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785875759; c=relaxed/simple; bh=ytNYd4+/wsy7ZBmNcxlK2VLSwLzv+jqSmsriR2F+qoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KpwBicxb1z8sE7gCAJ/pXhsEVHLRaQBMVdPziAkwwntlZHPyWZXUrDmwWNW2DNM2pmyOzIG+E7lPjEYHj03Y3vDCAl8zhHQP5j+O+jeNFnzxogLO0nUA7cUrczXCxzyvlo+m7RkyoGGVBllijZT2om4Mffbv0xzRXLg7aZgp9K0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=FVTN0/O4; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="FVTN0/O4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1785875756; bh=ytNYd4+/wsy7ZBmNcxlK2VLSwLzv+jqSmsriR2F+qoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FVTN0/O43VQOIrsgqZv6MtSq+vpypPXNkDGaKdNws3qHmcd5FMTrnCbGMF//ZXH0i PW0s84FuXLBI80l/JiD6R4D3fDRH+pkMbYQbxK363yV6s1WKDVYAk0vr5fU2NsT5gB F/WNNSzh09GyEJdJ8Cqb1AhKnEDvLwqwJSngisjVfthtnhpWx5nFfrrrAQE+wyhNNV D3iDGg271mD8VgcCyCgIOSlBwfFVOyKlIRjALOruYilB1LzntaaR8NajjZOoI9U7tI nRBpjV6SSJOXnoALgo/XRl5iGNL/ud1PKj7RlkVho1ypNehYOZbJwLYq9VA+nG/gFq ReZivFmGpaHbQ== Received: from archlinux (unknown [100.64.1.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: leandrohrb) by bali.collaboradmins.com (Postfix) with ESMTPSA id E2A5C17E051A; Tue, 04 Aug 2026 22:35:51 +0200 (CEST) From: Leandro Ribeiro To: louis.chauvet@bootlin.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: [PATCH 07/11] drm/vkms: rename get_lut_index() to get_uniform_lut_index() Date: Tue, 4 Aug 2026 17:33:47 -0300 Message-ID: <20260804203351.148521-8-leandro.ribeiro@collabora.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260804203351.148521-1-leandro.ribeiro@collabora.com> References: <20260804203351.148521-1-leandro.ribeiro@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In the next commits we'll add non-uniform LUTs, and this function will be used exclusively by uniform LUTs. So rename it to make this clearer. Signed-off-by: Leandro Ribeiro --- drivers/gpu/drm/vkms/tests/vkms_color_test.c | 28 ++++++++++---------- drivers/gpu/drm/vkms/vkms_composer.c | 6 ++--- drivers/gpu/drm/vkms/vkms_composer.h | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/vkms/tests/vkms_color_test.c b/drivers/gpu/drm/vkms/tests/vkms_color_test.c index cfcd7e8e7640..bb9d84377b97 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_color_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_color_test.c @@ -86,31 +86,31 @@ static const struct vkms_color_lut test_linear_lut = { .channel_value2index_ratio = 0xf000fll }; -static void vkms_color_test_get_lut_index(struct kunit *test) +static void vkms_color_test_get_uniform_lut_index(struct kunit *test) { s64 lut_index; int i; - lut_index = get_lut_index(&test_linear_lut, test_linear_array[0].red); + lut_index = get_uniform_lut_index(&test_linear_lut, test_linear_array[0].red); KUNIT_EXPECT_EQ(test, drm_fixp2int(lut_index), 0); for (i = 0; i < test_linear_lut.lut_length; i++) { - lut_index = get_lut_index(&test_linear_lut, test_linear_array[i].red); + lut_index = get_uniform_lut_index(&test_linear_lut, test_linear_array[i].red); KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(lut_index), i); } - KUNIT_EXPECT_EQ(test, drm_fixp2int(get_lut_index(&srgb_eotf, 0x0)), 0x0); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_eotf, 0x0)), 0x0); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_eotf, 0x101)), 0x1); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_eotf, 0x202)), 0x2); + KUNIT_EXPECT_EQ(test, drm_fixp2int(get_uniform_lut_index(&srgb_eotf, 0x0)), 0x0); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_eotf, 0x0)), 0x0); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_eotf, 0x101)), 0x1); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_eotf, 0x202)), 0x2); - KUNIT_EXPECT_EQ(test, drm_fixp2int(get_lut_index(&srgb_inv_eotf, 0x0)), 0x0); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_inv_eotf, 0x0)), 0x0); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_inv_eotf, 0x101)), 0x1); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_inv_eotf, 0x202)), 0x2); + KUNIT_EXPECT_EQ(test, drm_fixp2int(get_uniform_lut_index(&srgb_inv_eotf, 0x0)), 0x0); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_inv_eotf, 0x0)), 0x0); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_inv_eotf, 0x101)), 0x1); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_inv_eotf, 0x202)), 0x2); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_eotf, 0xfefe)), 0xfe); - KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&srgb_eotf, 0xffff)), 0xff); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_eotf, 0xfefe)), 0xfe); + KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_uniform_lut_index(&srgb_eotf, 0xffff)), 0xff); } static void vkms_color_test_lerp(struct kunit *test) @@ -392,7 +392,7 @@ static void vkms_color_ctm_3x4_bt709(struct kunit *test) } static struct kunit_case vkms_color_test_cases[] = { - KUNIT_CASE(vkms_color_test_get_lut_index), + KUNIT_CASE(vkms_color_test_get_uniform_lut_index), KUNIT_CASE(vkms_color_test_lerp), KUNIT_CASE(vkms_color_test_linear), KUNIT_CASE(vkms_color_srgb_inv_srgb), diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index a022554e4b1a..1a5e899e5b4a 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -93,19 +93,19 @@ static inline u16 lut_channel_value(const struct drm_color_lut *lut, return 0; } -VISIBLE_IF_KUNIT s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value) +VISIBLE_IF_KUNIT s64 get_uniform_lut_index(const struct vkms_color_lut *lut, u16 channel_value) { s64 color_channel_fp = drm_int2fixp(channel_value); return drm_fixp_mul(color_channel_fp, lut->channel_value2index_ratio); } -EXPORT_SYMBOL_IF_KUNIT(get_lut_index); +EXPORT_SYMBOL_IF_KUNIT(get_uniform_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); + s64 lut_index = get_uniform_lut_index(lut, channel_value); u16 floor_channel_value, ceil_channel_value; /* diff --git a/drivers/gpu/drm/vkms/vkms_composer.h b/drivers/gpu/drm/vkms/vkms_composer.h index 04dd5646f672..fa003af12f85 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.h +++ b/drivers/gpu/drm/vkms/vkms_composer.h @@ -19,7 +19,7 @@ enum lut_channel { #if IS_ENABLED(CONFIG_KUNIT) u16 lerp_u16(u16 a, u16 b, s64 t); -s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value); +s64 get_uniform_lut_index(const struct vkms_color_lut *lut, u16 channel_value); u16 apply_lut_to_channel_value(const struct vkms_color_lut *lut, u16 channel_value, enum lut_channel channel); void apply_3x4_matrix(struct pixel_argb_s32 *pixel, const struct drm_color_ctm_3x4 *matrix); -- 2.55.0