Skip to content

Commit 1b75447

Browse files
Harry Wentlandemersion
authored andcommitted
drm/colorop: Add PQ 125 EOTF and its inverse
The PQ function defines a mapping of code values to nits (cd/m^2). The max code value maps to 10,000 nits. Windows DWM's canonical composition color space (CCCS) defaults to composing SDR contents to 80 nits and uses a float value of 1.0 to represent this. For this reason AMD HW hard-codes a PQ function that is scaled by 125, yielding 80 nit PQ values for 1.0 and 10,000 nits at 125.0. This patch introduces this scaled PQ EOTF and its inverse as 1D curve types. Reviewed-by: Simon Ser <contact@emersion.fr> Signed-off-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com> Signed-off-by: Simon Ser <contact@emersion.fr> Link: https://patch.msgid.link/20251115000237.3561250-32-alex.hung@amd.com
1 parent 52da832 commit 1b75447

2 files changed

Lines changed: 26 additions & 0 deletions

File tree

drivers/gpu/drm/drm_colorop.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ static const struct drm_prop_enum_list drm_colorop_type_enum_list[] = {
7070
static const char * const colorop_curve_1d_type_names[] = {
7171
[DRM_COLOROP_1D_CURVE_SRGB_EOTF] = "sRGB EOTF",
7272
[DRM_COLOROP_1D_CURVE_SRGB_INV_EOTF] = "sRGB Inverse EOTF",
73+
[DRM_COLOROP_1D_CURVE_PQ_125_EOTF] = "PQ 125 EOTF",
74+
[DRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF] = "PQ 125 Inverse EOTF",
7375
};
7476

7577
/* Init Helpers */

include/drm/drm_colorop.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ enum drm_colorop_curve_1d_type {
5858
*/
5959
DRM_COLOROP_1D_CURVE_SRGB_INV_EOTF,
6060

61+
/**
62+
* @DRM_COLOROP_1D_CURVE_PQ_125_EOTF:
63+
*
64+
* enum string "PQ 125 EOTF"
65+
*
66+
* The PQ transfer function, scaled by 125.0f, so that 10,000
67+
* nits correspond to 125.0f.
68+
*
69+
* Transfer characteristics of the PQ function as defined by
70+
* SMPTE ST 2084 (2014) for 10-, 12-, 14-, and 16-bit systems
71+
* and Rec. ITU-R BT.2100-2 perceptual quantization (PQ) system,
72+
* represented by H.273 TransferCharacteristics code point 16.
73+
*/
74+
DRM_COLOROP_1D_CURVE_PQ_125_EOTF,
75+
76+
/**
77+
* @DRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF:
78+
*
79+
* enum string "PQ 125 Inverse EOTF"
80+
*
81+
* The inverse of DRM_COLOROP_1D_CURVE_PQ_125_EOTF.
82+
*/
83+
DRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF,
84+
6185
/**
6286
* @DRM_COLOROP_1D_CURVE_COUNT:
6387
*

0 commit comments

Comments
 (0)