Expose AMD's Gamma 2.4 and 2.6 TFs
Subsystems (4)
Harry Wentland
maintainercover Expose AMD's Gamma 2.4 and 2.6 TFs
During the Hackfest there was some interest in possibly using the 2.4 and 2.6 gamma curves that AMD HW supports. Add the colorop definitions and expose them for amdgpu.
Harry Wentland (2):
drm/colorop: Define Gamma 2.4 and 2.6 and its Inverse drm/amd/display: Add support for 2.4 and 2.6 Gamma and its Inverse
.../amd/display/amdgpu_dm/amdgpu_dm_color.c | 6 +++ .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 12 ++++-- drivers/gpu/drm/drm_colorop.c | 4 ++ include/drm/drm_colorop.h | 39 +++++++++++++++++++ 4 files changed, 58 insertions(+), 3 deletions(-)
--
2.54.0
Harry Wentland
maintainerPATCH 1/2 drm/colorop: Define Gamma 2.4 and 2.6 and its Inverse
Add new 1D curve colorop types for the Gamma 2.4 and Gamma 2.6 power functions and their inverses.
--- drivers/gpu/drm/drm_colorop.c | 4 ++++ include/drm/drm_colorop.h | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
drivers/gpu/drm/drm_colorop.c +4 -0
@@ -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[] = {
include/drm/drm_colorop.h +39 -0
@@ -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: *
Signature · 1 line
2.54.0
Harry Wentland
maintainerPATCH 2/2 drm/amd/display: Add support for 2.4 and 2.6 Gamma and its Inverse
In reply to Harry WentlandWire up the newly defined Gamma 2.4 and Gamma 2.6 curve types in the amdgpu DM color pipeline. Map them to the corresponding DC transfer functions and advertise them in the supported degamma, shaper, and blend transfer function masks.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 6 ++++++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +6 -0
@@ -896,6 +896,12 @@ amdgpu_colorop_tf_to_dc_tf(enum drm_colorop_curve_1d_type tf)case DRM_COLOROP_1D_CURVE_GAMMA22 :case DRM_COLOROP_1D_CURVE_GAMMA22_INV :return TRANSFER_FUNCTION_GAMMA22 ; +case DRM_COLOROP_1D_CURVE_GAMMA24 : +case DRM_COLOROP_1D_CURVE_GAMMA24_INV : +return TRANSFER_FUNCTION_GAMMA24 ; +case DRM_COLOROP_1D_CURVE_GAMMA26 : +case DRM_COLOROP_1D_CURVE_GAMMA26_INV : +return TRANSFER_FUNCTION_GAMMA26 ;default :return TRANSFER_FUNCTION_LINEAR ; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c +9 -3
@@ -37,19 +37,25 @@ 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_GAMMA22 ); +BIT (DRM_COLOROP_1D_CURVE_GAMMA22 ) | +BIT (DRM_COLOROP_1D_CURVE_GAMMA24 ) | +BIT (DRM_COLOROP_1D_CURVE_GAMMA26 );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_GAMMA22_INV ); +BIT (DRM_COLOROP_1D_CURVE_GAMMA22_INV ) | +BIT (DRM_COLOROP_1D_CURVE_GAMMA24_INV ) | +BIT (DRM_COLOROP_1D_CURVE_GAMMA26_INV );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_GAMMA22 ); +BIT (DRM_COLOROP_1D_CURVE_GAMMA22 ) | +BIT (DRM_COLOROP_1D_CURVE_GAMMA24 ) | +BIT (DRM_COLOROP_1D_CURVE_GAMMA26 );#define MAX_COLOR_PIPELINE_OPS 10
Signature · 1 line
2.54.0