* [PATCH v1 1/4] drm/colorop: Define Gamma 2.4 and 2.6 and its Inverse
2026-11-19 15:54 [PATCH v1 0/4] drm/amd/display: Add Gamma 2.4 and 2.6 colorop support Harry Wentland
@ 2026-11-19 15:54 ` Harry Wentland
2026-11-19 15:54 ` [PATCH v1 2/4] drm/amd/display: Use the wide CM3 curve for gamma 2.4 and 2.6 Harry Wentland
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Harry Wentland @ 2026-11-19 15:54 UTC (permalink / raw)
To: dri-devel, amd-gfx; +Cc: Harry Wentland
Add new 1D curve colorop types for the Gamma 2.4 and Gamma 2.6 power
functions and their inverses.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
drivers/gpu/drm/drm_colorop.c | 4 ++++
include/drm/drm_colorop.h | 39 +++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c
index 682fcc651525..d62153fd9c71 100644
--- a/drivers/gpu/drm/drm_colorop.c
+++ b/drivers/gpu/drm/drm_colorop.c
@@ -79,6 +79,10 @@ static const char * const colorop_curve_1d_type_names[] = {
[DRM_COLOROP_1D_CURVE_BT2020_OETF] = "BT.2020 OETF",
[DRM_COLOROP_1D_CURVE_GAMMA22] = "Gamma 2.2",
[DRM_COLOROP_1D_CURVE_GAMMA22_INV] = "Gamma 2.2 Inverse",
+ [DRM_COLOROP_1D_CURVE_GAMMA24] = "Gamma 2.4",
+ [DRM_COLOROP_1D_CURVE_GAMMA24_INV] = "Gamma 2.4 Inverse",
+ [DRM_COLOROP_1D_CURVE_GAMMA26] = "Gamma 2.6",
+ [DRM_COLOROP_1D_CURVE_GAMMA26_INV] = "Gamma 2.6 Inverse",
};
static const struct drm_prop_enum_list drm_colorop_lut1d_interpolation_list[] = {
diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
index 224fae40ed2b..5c4c763da83e 100644
--- a/include/drm/drm_colorop.h
+++ b/include/drm/drm_colorop.h
@@ -126,6 +126,45 @@ enum drm_colorop_curve_1d_type {
* The inverse of &DRM_COLOROP_1D_CURVE_GAMMA22
*/
DRM_COLOROP_1D_CURVE_GAMMA22_INV,
+
+ /**
+ * @DRM_COLOROP_1D_CURVE_GAMMA24:
+ *
+ * enum string "Gamma 2.4"
+ *
+ * A gamma 2.4 power function. This applies a power curve with
+ * gamma value of 2.4 to the input values.
+ */
+ DRM_COLOROP_1D_CURVE_GAMMA24,
+
+ /**
+ * @DRM_COLOROP_1D_CURVE_GAMMA24_INV:
+ *
+ * enum string "Gamma 2.4 Inverse"
+ *
+ * The inverse of &DRM_COLOROP_1D_CURVE_GAMMA24
+ */
+ DRM_COLOROP_1D_CURVE_GAMMA24_INV,
+
+ /**
+ * @DRM_COLOROP_1D_CURVE_GAMMA26:
+ *
+ * enum string "Gamma 2.6"
+ *
+ * A gamma 2.6 power function. This applies a power curve with
+ * gamma value of 2.6 to the input values.
+ */
+ DRM_COLOROP_1D_CURVE_GAMMA26,
+
+ /**
+ * @DRM_COLOROP_1D_CURVE_GAMMA26_INV:
+ *
+ * enum string "Gamma 2.6 Inverse"
+ *
+ * The inverse of &DRM_COLOROP_1D_CURVE_GAMMA26
+ */
+ DRM_COLOROP_1D_CURVE_GAMMA26_INV,
+
/**
* @DRM_COLOROP_1D_CURVE_COUNT:
*
--
2.56.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v1 2/4] drm/amd/display: Use the wide CM3 curve for gamma 2.4 and 2.6
2026-11-19 15:54 [PATCH v1 0/4] drm/amd/display: Add Gamma 2.4 and 2.6 colorop support Harry Wentland
2026-11-19 15:54 ` [PATCH v1 1/4] drm/colorop: Define Gamma 2.4 and 2.6 and its Inverse Harry Wentland
@ 2026-11-19 15:54 ` Harry Wentland
2026-11-19 15:54 ` [PATCH v1 3/4] drm/amd/display: Add support for 2.4 and 2.6 Gamma and its Inverse Harry Wentland
2026-11-19 15:54 ` [PATCH v1 4/4] drm/amd/display: Add KUnit cases for gamma 2.4 and 2.6 colorops Harry Wentland
3 siblings, 0 replies; 6+ messages in thread
From: Harry Wentland @ 2026-11-19 15:54 UTC (permalink / raw)
To: dri-devel, amd-gfx; +Cc: Harry Wentland
cm3_helper_translate_curve_to_hw_format() puts PQ, gamma 2.2, and HLG
on 32 regions from 2^-25 to 2^7. Gamma 2.4 and 2.6 used the other
layout, 12 regions from 2^-12 to 2^0.
The inverse curve is the shaper, and its input is linear light from
degamma. A 10-bit code v becomes (v/1023)^g. That is below 2^-12 for
v = 1..31 at gamma 2.4 and v = 1..41 at gamma 2.6, so those codes come
back as 0. On a gray ramp the round trip then misses the IGT bracket
of 13. Gamma 2.4 needs a bracket of 33 and gamma 2.6 needs 41. Gamma
2.2 already uses the wide curve and its round trip is exact.
Use the 32-region curve for gamma 2.4 and 2.6. Its low end is 2^-25,
which covers those dark codes. On DCN 4.0.1 the gamma 2.4 round trip
is exact and gamma 2.6 is off by one 10-bit code, so the original
bracket of 13 passes.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
index eb299f7f9c41..8a76e985d359 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
@@ -133,6 +133,8 @@ bool cm3_helper_translate_curve_to_hw_format(struct dc_context *ctx,
memset(seg_distr, 0, sizeof(seg_distr));
if (output_tf->tf == TRANSFER_FUNCTION_PQ || output_tf->tf == TRANSFER_FUNCTION_GAMMA22 ||
+ output_tf->tf == TRANSFER_FUNCTION_GAMMA24 ||
+ output_tf->tf == TRANSFER_FUNCTION_GAMMA26 ||
output_tf->tf == TRANSFER_FUNCTION_HLG) {
/* 32 segments
* segments are from 2^-25 to 2^7
--
2.56.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v1 4/4] drm/amd/display: Add KUnit cases for gamma 2.4 and 2.6 colorops
2026-11-19 15:54 [PATCH v1 0/4] drm/amd/display: Add Gamma 2.4 and 2.6 colorop support Harry Wentland
` (2 preceding siblings ...)
2026-11-19 15:54 ` [PATCH v1 3/4] drm/amd/display: Add support for 2.4 and 2.6 Gamma and its Inverse Harry Wentland
@ 2026-11-19 15:54 ` Harry Wentland
3 siblings, 0 replies; 6+ messages in thread
From: Harry Wentland @ 2026-11-19 15:54 UTC (permalink / raw)
To: dri-devel, amd-gfx; +Cc: Harry Wentland
Check that amdgpu_colorop_tf_to_dc_tf() maps the gamma 2.4 and 2.6
curves and their inverses to TRANSFER_FUNCTION_GAMMA24 and
TRANSFER_FUNCTION_GAMMA26.
Check that the degamma and blend masks include gamma 2.4 and 2.6, and
that the shaper mask includes their inverses. Update the
*_no_extra_bits cases for the new mask values.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
.../amdgpu_dm/tests/amdgpu_dm_color_test.c | 18 +++++++
.../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 54 +++++++++++++++++--
2 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_color_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_color_test.c
index 7ad8c56cbcf3..7a2c137f2967 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_color_test.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_color_test.c
@@ -330,6 +330,22 @@ static void dm_test_colorop_tf_to_dc_tf_gamma22(struct kunit *test)
(int)TRANSFER_FUNCTION_GAMMA22);
}
+static void dm_test_colorop_tf_to_dc_tf_gamma24(struct kunit *test)
+{
+ KUNIT_EXPECT_EQ(test, (int)amdgpu_colorop_tf_to_dc_tf(DRM_COLOROP_1D_CURVE_GAMMA24),
+ (int)TRANSFER_FUNCTION_GAMMA24);
+ KUNIT_EXPECT_EQ(test, (int)amdgpu_colorop_tf_to_dc_tf(DRM_COLOROP_1D_CURVE_GAMMA24_INV),
+ (int)TRANSFER_FUNCTION_GAMMA24);
+}
+
+static void dm_test_colorop_tf_to_dc_tf_gamma26(struct kunit *test)
+{
+ KUNIT_EXPECT_EQ(test, (int)amdgpu_colorop_tf_to_dc_tf(DRM_COLOROP_1D_CURVE_GAMMA26),
+ (int)TRANSFER_FUNCTION_GAMMA26);
+ KUNIT_EXPECT_EQ(test, (int)amdgpu_colorop_tf_to_dc_tf(DRM_COLOROP_1D_CURVE_GAMMA26_INV),
+ (int)TRANSFER_FUNCTION_GAMMA26);
+}
+
static void dm_test_colorop_tf_to_dc_tf_default(struct kunit *test)
{
KUNIT_EXPECT_EQ(test, (int)amdgpu_colorop_tf_to_dc_tf(DRM_COLOROP_1D_CURVE_COUNT),
@@ -2928,6 +2944,8 @@ static struct kunit_case dm_color_test_cases[] = {
KUNIT_CASE(dm_test_colorop_tf_to_dc_tf_pq),
KUNIT_CASE(dm_test_colorop_tf_to_dc_tf_bt2020),
KUNIT_CASE(dm_test_colorop_tf_to_dc_tf_gamma22),
+ KUNIT_CASE(dm_test_colorop_tf_to_dc_tf_gamma24),
+ KUNIT_CASE(dm_test_colorop_tf_to_dc_tf_gamma26),
KUNIT_CASE(dm_test_colorop_tf_to_dc_tf_default),
/* __drm_lut_to_dc_gamma */
KUNIT_CASE(dm_test_drm_lut_to_dc_gamma_legacy_zero),
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_colorop_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_colorop_test.c
index 27cd4b8500e8..9195a2c827ab 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_colorop_test.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_colorop_test.c
@@ -40,12 +40,26 @@ static void dm_test_supported_degam_tfs_has_gamma22(struct kunit *test)
BIT(DRM_COLOROP_1D_CURVE_GAMMA22));
}
+static void dm_test_supported_degam_tfs_has_gamma24(struct kunit *test)
+{
+ KUNIT_EXPECT_TRUE(test, amdgpu_dm_supported_degam_tfs &
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA24));
+}
+
+static void dm_test_supported_degam_tfs_has_gamma26(struct kunit *test)
+{
+ KUNIT_EXPECT_TRUE(test, amdgpu_dm_supported_degam_tfs &
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA26));
+}
+
static void dm_test_supported_degam_tfs_no_extra_bits(struct kunit *test)
{
u64 expected = BIT(DRM_COLOROP_1D_CURVE_SRGB_EOTF) |
BIT(DRM_COLOROP_1D_CURVE_PQ_125_EOTF) |
BIT(DRM_COLOROP_1D_CURVE_BT2020_INV_OETF) |
- BIT(DRM_COLOROP_1D_CURVE_GAMMA22);
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA22) |
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA24) |
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA26);
KUNIT_EXPECT_EQ(test, amdgpu_dm_supported_degam_tfs, expected);
}
@@ -76,12 +90,26 @@ static void dm_test_supported_shaper_tfs_has_gamma22_inv(struct kunit *test)
BIT(DRM_COLOROP_1D_CURVE_GAMMA22_INV));
}
+static void dm_test_supported_shaper_tfs_has_gamma24_inv(struct kunit *test)
+{
+ KUNIT_EXPECT_TRUE(test, amdgpu_dm_supported_shaper_tfs &
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA24_INV));
+}
+
+static void dm_test_supported_shaper_tfs_has_gamma26_inv(struct kunit *test)
+{
+ KUNIT_EXPECT_TRUE(test, amdgpu_dm_supported_shaper_tfs &
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA26_INV));
+}
+
static void dm_test_supported_shaper_tfs_no_extra_bits(struct kunit *test)
{
u64 expected = BIT(DRM_COLOROP_1D_CURVE_SRGB_INV_EOTF) |
BIT(DRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF) |
BIT(DRM_COLOROP_1D_CURVE_BT2020_OETF) |
- BIT(DRM_COLOROP_1D_CURVE_GAMMA22_INV);
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA22_INV) |
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA24_INV) |
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA26_INV);
KUNIT_EXPECT_EQ(test, amdgpu_dm_supported_shaper_tfs, expected);
}
@@ -112,12 +140,26 @@ static void dm_test_supported_blnd_tfs_has_gamma22(struct kunit *test)
BIT(DRM_COLOROP_1D_CURVE_GAMMA22));
}
+static void dm_test_supported_blnd_tfs_has_gamma24(struct kunit *test)
+{
+ KUNIT_EXPECT_TRUE(test, amdgpu_dm_supported_blnd_tfs &
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA24));
+}
+
+static void dm_test_supported_blnd_tfs_has_gamma26(struct kunit *test)
+{
+ KUNIT_EXPECT_TRUE(test, amdgpu_dm_supported_blnd_tfs &
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA26));
+}
+
static void dm_test_supported_blnd_tfs_no_extra_bits(struct kunit *test)
{
u64 expected = BIT(DRM_COLOROP_1D_CURVE_SRGB_EOTF) |
BIT(DRM_COLOROP_1D_CURVE_PQ_125_EOTF) |
BIT(DRM_COLOROP_1D_CURVE_BT2020_INV_OETF) |
- BIT(DRM_COLOROP_1D_CURVE_GAMMA22);
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA22) |
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA24) |
+ BIT(DRM_COLOROP_1D_CURVE_GAMMA26);
KUNIT_EXPECT_EQ(test, amdgpu_dm_supported_blnd_tfs, expected);
}
@@ -497,18 +539,24 @@ static struct kunit_case dm_colorop_test_cases[] = {
KUNIT_CASE(dm_test_supported_degam_tfs_has_pq125_eotf),
KUNIT_CASE(dm_test_supported_degam_tfs_has_bt2020_inv_oetf),
KUNIT_CASE(dm_test_supported_degam_tfs_has_gamma22),
+ KUNIT_CASE(dm_test_supported_degam_tfs_has_gamma24),
+ KUNIT_CASE(dm_test_supported_degam_tfs_has_gamma26),
KUNIT_CASE(dm_test_supported_degam_tfs_no_extra_bits),
/* shaper TFs */
KUNIT_CASE(dm_test_supported_shaper_tfs_has_srgb_inv_eotf),
KUNIT_CASE(dm_test_supported_shaper_tfs_has_pq125_inv_eotf),
KUNIT_CASE(dm_test_supported_shaper_tfs_has_bt2020_oetf),
KUNIT_CASE(dm_test_supported_shaper_tfs_has_gamma22_inv),
+ KUNIT_CASE(dm_test_supported_shaper_tfs_has_gamma24_inv),
+ KUNIT_CASE(dm_test_supported_shaper_tfs_has_gamma26_inv),
KUNIT_CASE(dm_test_supported_shaper_tfs_no_extra_bits),
/* blnd TFs */
KUNIT_CASE(dm_test_supported_blnd_tfs_has_srgb_eotf),
KUNIT_CASE(dm_test_supported_blnd_tfs_has_pq125_eotf),
KUNIT_CASE(dm_test_supported_blnd_tfs_has_bt2020_inv_oetf),
KUNIT_CASE(dm_test_supported_blnd_tfs_has_gamma22),
+ KUNIT_CASE(dm_test_supported_blnd_tfs_has_gamma24),
+ KUNIT_CASE(dm_test_supported_blnd_tfs_has_gamma26),
KUNIT_CASE(dm_test_supported_blnd_tfs_no_extra_bits),
/* cross-check */
KUNIT_CASE(dm_test_degam_and_blnd_tfs_match),
--
2.56.1
^ permalink raw reply related [flat|nested] 6+ messages in thread