[RFC PATCH v4 37/42] drm/amd/display: Add support for BT.709 and BT.2020 TFs

[Harry Wentland]

This adds support for the BT.709/BT.2020 transfer functions
on all current 1D curve plane colorops, i.e., on DEGAM, SHAPER,
and BLND blocks.

With this change the following IGT subtests pass:
kms_colorop --run plane-XR30-XR30-bt2020_inv_oetf
kms_colorop --run plane-XR30-XR30-bt2020_oetf

Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c   | 11 ++++++++---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 10 +++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

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 20b7eb47388c..d5d356cf9fc6 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -677,6 +677,9 @@ amdgpu_colorop_tf_to_dc_tf(enum drm_colorop_curve_1d_type 
tf)
        case DRM_COLOROP_1D_CURVE_SRGB_EOTF:
        case DRM_COLOROP_1D_CURVE_SRGB_INV_EOTF:
                return TRANSFER_FUNCTION_SRGB;
+       case DRM_COLOROP_1D_CURVE_BT2020_INV_OETF:
+       case DRM_COLOROP_1D_CURVE_BT2020_OETF:
+               return TRANSFER_FUNCTION_BT709;
        case DRM_COLOROP_1D_CURVE_PQ_125_EOTF:
        case DRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF:
                return TRANSFER_FUNCTION_PQ;
@@ -1287,8 +1290,10 @@ __set_colorop_1d_curve_blend_tf_lut(struct 
dc_plane_state *dc_plane_state,
        const struct drm_color_lut *blend_lut;
        uint32_t blend_size;
 
-       if (colorop->type != DRM_COLOROP_1D_CURVE &&
-           colorop_state->curve_1d_type != DRM_COLOROP_1D_CURVE_SRGB_EOTF)
+       if (colorop->type != DRM_COLOROP_1D_CURVE)
+               return -EINVAL;
+
+       if (!(BIT(colorop_state->curve_1d_type) & amdgpu_dm_supported_blnd_tfs))
                return -EINVAL;
 
        if (colorop_state->bypass) {
@@ -1324,7 +1329,7 @@ __set_dm_plane_colorop_blend(struct drm_plane_state 
*plane_state,
        /* 3nd op: 1d curve - blend */
        for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) {
                if (new_colorop_state->colorop == old_colorop &&
-                   new_colorop_state->curve_1d_type == 
DRM_COLOROP_1D_CURVE_SRGB_EOTF) {
+                   (BIT(new_colorop_state->curve_1d_type) & 
amdgpu_dm_supported_blnd_tfs)) {
                        colorop_state = new_colorop_state;
                        break;
                }
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 f99d8e09d89b..bc66bd4f9fdd 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
@@ -33,14 +33,18 @@
 
 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_PQ_125_EOTF) |
+       BIT(DRM_COLOROP_1D_CURVE_BT2020_INV_OETF);
 
 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_PQ_125_INV_EOTF) |
+       BIT(DRM_COLOROP_1D_CURVE_BT2020_OETF);
 
 const u64 amdgpu_dm_supported_blnd_tfs =
-       BIT(DRM_COLOROP_1D_CURVE_SRGB_EOTF);
+       BIT(DRM_COLOROP_1D_CURVE_SRGB_EOTF) |
+       BIT(DRM_COLOROP_1D_CURVE_PQ_125_EOTF) |
+       BIT(DRM_COLOROP_1D_CURVE_BT2020_INV_OETF);
 
 int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct 
drm_prop_enum_list *list)
 {
-- 
2.44.0