Commit 1626761e authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher

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: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarSimon Ser <contact@emersion.fr>
Reviewed-by: default avatarSebastian Wick <sebastian.wick@redhat.com>
Reviewed-by: default avatarPekka Paalanen <pekka.paalanen@collabora.com>
Reviewed-by: default avatarJoshua 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: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 597364ad
...@@ -1636,7 +1636,7 @@ enum dp_pixelformat { ...@@ -1636,7 +1636,7 @@ enum dp_pixelformat {
* *
* This enum is used to indicate DP VSC SDP Colorimetry formats. * This enum is used to indicate DP VSC SDP Colorimetry formats.
* It is based on DP 1.4 spec [Table 2-117: VSC SDP Payload for DB16 through * It is based on DP 1.4 spec [Table 2-117: VSC SDP Payload for DB16 through
* DB18] and a name of enum member follows DRM_MODE_COLORIMETRY definition. * DB18] and a name of enum member follows enum drm_colorimetry definition.
* *
* @DP_COLORIMETRY_DEFAULT: sRGB (IEC 61966-2-1) or * @DP_COLORIMETRY_DEFAULT: sRGB (IEC 61966-2-1) or
* ITU-R BT.601 colorimetry format * ITU-R BT.601 colorimetry format
......
...@@ -427,29 +427,30 @@ enum drm_privacy_screen_status { ...@@ -427,29 +427,30 @@ enum drm_privacy_screen_status {
* a colorspace property which will be created and exposed to * a colorspace property which will be created and exposed to
* userspace. * userspace.
*/ */
enum drm_colorspace {
/* For Default case, driver will set the colorspace */ /* For Default case, driver will set the colorspace */
#define DRM_MODE_COLORIMETRY_DEFAULT 0 DRM_MODE_COLORIMETRY_DEFAULT = 0,
/* CEA 861 Normal Colorimetry options */ /* CEA 861 Normal Colorimetry options */
#define DRM_MODE_COLORIMETRY_NO_DATA 0 DRM_MODE_COLORIMETRY_NO_DATA = 0,
#define DRM_MODE_COLORIMETRY_SMPTE_170M_YCC 1 DRM_MODE_COLORIMETRY_SMPTE_170M_YCC = 1,
#define DRM_MODE_COLORIMETRY_BT709_YCC 2 DRM_MODE_COLORIMETRY_BT709_YCC = 2,
/* CEA 861 Extended Colorimetry Options */ /* CEA 861 Extended Colorimetry Options */
#define DRM_MODE_COLORIMETRY_XVYCC_601 3 DRM_MODE_COLORIMETRY_XVYCC_601 = 3,
#define DRM_MODE_COLORIMETRY_XVYCC_709 4 DRM_MODE_COLORIMETRY_XVYCC_709 = 4,
#define DRM_MODE_COLORIMETRY_SYCC_601 5 DRM_MODE_COLORIMETRY_SYCC_601 = 5,
#define DRM_MODE_COLORIMETRY_OPYCC_601 6 DRM_MODE_COLORIMETRY_OPYCC_601 = 6,
#define DRM_MODE_COLORIMETRY_OPRGB 7 DRM_MODE_COLORIMETRY_OPRGB = 7,
#define DRM_MODE_COLORIMETRY_BT2020_CYCC 8 DRM_MODE_COLORIMETRY_BT2020_CYCC = 8,
#define DRM_MODE_COLORIMETRY_BT2020_RGB 9 DRM_MODE_COLORIMETRY_BT2020_RGB = 9,
#define DRM_MODE_COLORIMETRY_BT2020_YCC 10 DRM_MODE_COLORIMETRY_BT2020_YCC = 10,
/* Additional Colorimetry extension added as part of CTA 861.G */ /* Additional Colorimetry extension added as part of CTA 861.G */
#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 11 DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 = 11,
#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER 12 DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER = 12,
/* Additional Colorimetry Options added for DP 1.4a VSC Colorimetry Format */ /* Additional Colorimetry Options added for DP 1.4a VSC Colorimetry Format */
#define DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED 13 DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED = 13,
#define DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT 14 DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT = 14,
#define DRM_MODE_COLORIMETRY_BT601_YCC 15 DRM_MODE_COLORIMETRY_BT601_YCC = 15,
};
/** /**
* enum drm_bus_flags - bus_flags info for &drm_display_info * enum drm_bus_flags - bus_flags info for &drm_display_info
...@@ -901,7 +902,7 @@ struct drm_connector_state { ...@@ -901,7 +902,7 @@ struct drm_connector_state {
* colorspace change on Sink. This is most commonly used to switch * colorspace change on Sink. This is most commonly used to switch
* to wider color gamuts like BT2020. * to wider color gamuts like BT2020.
*/ */
u32 colorspace; enum drm_colorspace colorspace;
/** /**
* @writeback_job: Writeback job for writeback connectors * @writeback_job: Writeback job for writeback connectors
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment