drm/amd/display: Enable support for Gamma 2.2

This patchset enables support for the Gamma 2.2.

With this patch the following IGT subtests pass:

kms_colorop --run plane-XR30-XR30-gamma_2_2

kms_colorop --run plane-XR30-XR30-gamma_2_2_inv-gamma_2_2

kms_colorop --run plane-XR30-XR30-gamma_2_2_inv-gamma_2_2-gamma_2_2_inv

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Simon Ser <contact@emersion.fr>
Link: https://patch.msgid.link/20251115000237.3561250-52-alex.hung@amd.com

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index 89bf9c6eafe22390123746aa862c28a79fa44846..1dcc79b35225f5c9128cfd020ce9a37fe6f42d39 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -890,6 +890,9 @@ amdgpu_colorop_tf_to_dc_tf(enum drm_colorop_curve_1d_type tf)
        case DRM_COLOROP_1D_CURVE_BT2020_INV_OETF:
        case DRM_COLOROP_1D_CURVE_BT2020_OETF:
                return TRANSFER_FUNCTION_BT709;
+       case DRM_COLOROP_1D_CURVE_GAMMA22:
+       case DRM_COLOROP_1D_CURVE_GAMMA22_INV:
+               return TRANSFER_FUNCTION_GAMMA22;
        default:
                return TRANSFER_FUNCTION_LINEAR;
        }

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
index d342dc1d85f7d7b86f7dfe34660f321e2e0a4305..d585618b8064eadbbf1d0b3a1bb25d9e35d87ca8 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
@@ -36,17 +36,20 @@
 const u64 amdgpu_dm_supported_degam_tfs =
        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_BT2020_INV_OETF) |
+       BIT(DRM_COLOROP_1D_CURVE_GAMMA22_INV);
 
 const u64 amdgpu_dm_supported_shaper_tfs =
        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_BT2020_OETF) |
+       BIT(DRM_COLOROP_1D_CURVE_GAMMA22);
 
 const u64 amdgpu_dm_supported_blnd_tfs =
        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_BT2020_INV_OETF) |
+       BIT(DRM_COLOROP_1D_CURVE_GAMMA22_INV);
 
 #define MAX_COLOR_PIPELINE_OPS 10