On 2025-10-29 23:42, Alex Hung wrote:
> 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
>
> Signed-off-by: Alex Hung <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
Harry
> ---
> v12:
> - Add gamma 2.2
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3 +++
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 9 ++++++---
> 2 files changed, 9 insertions(+), 3 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 c3ddf136dbc8..6992067fd7d2 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
> @@ -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 f205f3c31f6a..64a4757d778b 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
> @@ -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
>
