Skip to content

Commit 1626761

Browse files
Harry Wentlandalexdeucher
authored andcommitted
drm/connector: Convert DRM_MODE_COLORIMETRY to enum
This allows us to use strongly typed arguments. v2: - Bring NO_DATA back - Provide explicit enum values v3: - Drop unnecessary '&' from kerneldoc (emersion) v4: - Fix Normal Colorimetry comment Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Simon Ser <contact@emersion.fr> Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com> Reviewed-by: Joshua Ashton <joshua@froggi.es> Cc: Pekka Paalanen <ppaalanen@gmail.com> Cc: Sebastian Wick <sebastian.wick@redhat.com> Cc: Vitaly.Prosyak@amd.com Cc: Uma Shankar <uma.shankar@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Joshua Ashton <joshua@froggi.es> Cc: Simon Ser <contact@emersion.fr> Cc: Melissa Wen <mwen@igalia.com> Cc: dri-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 597364a commit 1626761

2 files changed

Lines changed: 26 additions & 25 deletions

File tree

include/drm/display/drm_dp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@ enum dp_pixelformat {
16361636
*
16371637
* This enum is used to indicate DP VSC SDP Colorimetry formats.
16381638
* It is based on DP 1.4 spec [Table 2-117: VSC SDP Payload for DB16 through
1639-
* DB18] and a name of enum member follows DRM_MODE_COLORIMETRY definition.
1639+
* DB18] and a name of enum member follows enum drm_colorimetry definition.
16401640
*
16411641
* @DP_COLORIMETRY_DEFAULT: sRGB (IEC 61966-2-1) or
16421642
* ITU-R BT.601 colorimetry format

include/drm/drm_connector.h

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -427,29 +427,30 @@ enum drm_privacy_screen_status {
427427
* a colorspace property which will be created and exposed to
428428
* userspace.
429429
*/
430-
431-
/* For Default case, driver will set the colorspace */
432-
#define DRM_MODE_COLORIMETRY_DEFAULT 0
433-
/* CEA 861 Normal Colorimetry options */
434-
#define DRM_MODE_COLORIMETRY_NO_DATA 0
435-
#define DRM_MODE_COLORIMETRY_SMPTE_170M_YCC 1
436-
#define DRM_MODE_COLORIMETRY_BT709_YCC 2
437-
/* CEA 861 Extended Colorimetry Options */
438-
#define DRM_MODE_COLORIMETRY_XVYCC_601 3
439-
#define DRM_MODE_COLORIMETRY_XVYCC_709 4
440-
#define DRM_MODE_COLORIMETRY_SYCC_601 5
441-
#define DRM_MODE_COLORIMETRY_OPYCC_601 6
442-
#define DRM_MODE_COLORIMETRY_OPRGB 7
443-
#define DRM_MODE_COLORIMETRY_BT2020_CYCC 8
444-
#define DRM_MODE_COLORIMETRY_BT2020_RGB 9
445-
#define DRM_MODE_COLORIMETRY_BT2020_YCC 10
446-
/* Additional Colorimetry extension added as part of CTA 861.G */
447-
#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 11
448-
#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER 12
449-
/* Additional Colorimetry Options added for DP 1.4a VSC Colorimetry Format */
450-
#define DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED 13
451-
#define DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT 14
452-
#define DRM_MODE_COLORIMETRY_BT601_YCC 15
430+
enum drm_colorspace {
431+
/* For Default case, driver will set the colorspace */
432+
DRM_MODE_COLORIMETRY_DEFAULT = 0,
433+
/* CEA 861 Normal Colorimetry options */
434+
DRM_MODE_COLORIMETRY_NO_DATA = 0,
435+
DRM_MODE_COLORIMETRY_SMPTE_170M_YCC = 1,
436+
DRM_MODE_COLORIMETRY_BT709_YCC = 2,
437+
/* CEA 861 Extended Colorimetry Options */
438+
DRM_MODE_COLORIMETRY_XVYCC_601 = 3,
439+
DRM_MODE_COLORIMETRY_XVYCC_709 = 4,
440+
DRM_MODE_COLORIMETRY_SYCC_601 = 5,
441+
DRM_MODE_COLORIMETRY_OPYCC_601 = 6,
442+
DRM_MODE_COLORIMETRY_OPRGB = 7,
443+
DRM_MODE_COLORIMETRY_BT2020_CYCC = 8,
444+
DRM_MODE_COLORIMETRY_BT2020_RGB = 9,
445+
DRM_MODE_COLORIMETRY_BT2020_YCC = 10,
446+
/* Additional Colorimetry extension added as part of CTA 861.G */
447+
DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 = 11,
448+
DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER = 12,
449+
/* Additional Colorimetry Options added for DP 1.4a VSC Colorimetry Format */
450+
DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED = 13,
451+
DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT = 14,
452+
DRM_MODE_COLORIMETRY_BT601_YCC = 15,
453+
};
453454

454455
/**
455456
* enum drm_bus_flags - bus_flags info for &drm_display_info
@@ -901,7 +902,7 @@ struct drm_connector_state {
901902
* colorspace change on Sink. This is most commonly used to switch
902903
* to wider color gamuts like BT2020.
903904
*/
904-
u32 colorspace;
905+
enum drm_colorspace colorspace;
905906

906907
/**
907908
* @writeback_job: Writeback job for writeback connectors

0 commit comments

Comments
 (0)