Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 202bb015 authored by Gwan-gyeong Mun's avatar Gwan-gyeong Mun Committed by Alistair Delva
Browse files

UPSTREAM: drm: Add DisplayPort colorspace property creation function 



Because between HDMI and DP have different colorspaces, it adds
drm_mode_create_dp_colorspace_property() function for creating of DP
colorspace property.

v3: Addressed review comments from Ville
    - Add new colorimetry options for DP 1.4a spec.
    - Separate set of colorimetry enum values for DP.
v4: Add additional comments to struct drm_prop_enum_list.
    Polishing an enum string of struct drm_prop_enum_list
v5: Change definitions of DRM_MODE_COLORIMETRYs to follow HDMI prefix and
    DP abbreviations.
    Add missed variables on dp_colorspaces.
    Fix typo. [Uma]
v6: Addressed review comments from Ilia and Ville
   - Split drm_mode_create_colorspace_property() to DP and HDMI connector.
v7: Fix typo [Jani Saarinen]
    Fix white space.
v8: Addressed review comments from Ville
   - Drop colorimetries which have another way to distinguish or which
     would not be used.
v9: Addressed review comments from Ville
   - Split hunk into renaming and adding of code.

Signed-off-by: default avatarGwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190919195311.13972-5-gwan-gyeong.mun@intel.com


(cherry picked from commit 45cf0e91df8c75c3a0c69e54d01cf42e24af365b)
Bug: 139653858
Change-Id: I8bd640ed6dcea7e59f2360730ad06c636c056d01
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
parent 15dff3e2

drivers/gpu/drm/drm_connector.c

+63 −1
Original line number Original line Diff line number Diff line
@@ -882,6 +882,38 @@ static const struct drm_prop_enum_list hdmi_colorspaces[] = { 
	{ DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER, "DCI-P3_RGB_Theater" },

	{ DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER, "DCI-P3_RGB_Theater" },

};

};





/*

 * As per DP 1.4a spec, 2.2.5.7.5 VSC SDP Payload for Pixel Encoding/Colorimetry

 * Format Table 2-120

 */

static const struct drm_prop_enum_list dp_colorspaces[] = {

	/* For Default case, driver will set the colorspace */

	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },

	{ DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED, "RGB_Wide_Gamut_Fixed_Point" },

	/* Colorimetry based on scRGB (IEC 61966-2-2) */

	{ DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT, "RGB_Wide_Gamut_Floating_Point" },

	/* Colorimetry based on IEC 61966-2-5 */

	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },

	/* Colorimetry based on SMPTE RP 431-2 */

	{ DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65, "DCI-P3_RGB_D65" },

	/* Colorimetry based on ITU-R BT.2020 */

	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },

	{ DRM_MODE_COLORIMETRY_BT601_YCC, "BT601_YCC" },

	{ DRM_MODE_COLORIMETRY_BT709_YCC, "BT709_YCC" },

	/* Standard Definition Colorimetry based on IEC 61966-2-4 */

	{ DRM_MODE_COLORIMETRY_XVYCC_601, "XVYCC_601" },

	/* High Definition Colorimetry based on IEC 61966-2-4 */

	{ DRM_MODE_COLORIMETRY_XVYCC_709, "XVYCC_709" },

	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */

	{ DRM_MODE_COLORIMETRY_SYCC_601, "SYCC_601" },

	/* Colorimetry based on IEC 61966-2-5 [33] */

	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },

	/* Colorimetry based on ITU-R BT.2020 */

	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },

	/* Colorimetry based on ITU-R BT.2020 */

	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },

};



/**

/**

 * DOC: standard connector properties

 * DOC: standard connector properties

 *

 *
@@ -1694,7 +1726,8 @@ EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); 
 *        source is trying to drive.

 *        source is trying to drive.

 *

 *

 * Because between HDMI and DP have different colorspaces,

 * Because between HDMI and DP have different colorspaces,

 * drm_mode_create_hdmi_colorspace_property() is used for HDMI connector.

 * drm_mode_create_hdmi_colorspace_property() is used for HDMI connector and

 * drm_mode_create_dp_colorspace_property() is used for DP connector.

 */

 */





/**

/**
@@ -1726,6 +1759,35 @@ int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector) 
}

}

EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property);

EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property);





/**

 * drm_mode_create_dp_colorspace_property - create dp colorspace property

 * @connector: connector to create the Colorspace property on.

 *

 * Called by a driver the first time it's needed, must be attached to desired

 * DP connectors.

 *

 * Returns:

 * Zero on success, negative errono on failure.

 */

int drm_mode_create_dp_colorspace_property(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;



	if (connector->colorspace_property)

		return 0;



	connector->colorspace_property =

		drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, "Colorspace",

					 dp_colorspaces,

					 ARRAY_SIZE(dp_colorspaces));



	if (!connector->colorspace_property)

		return -ENOMEM;



	return 0;

}

EXPORT_SYMBOL(drm_mode_create_dp_colorspace_property);



/**

/**

 * drm_mode_create_content_type_property - create content type property

 * drm_mode_create_content_type_property - create content type property

 * @dev: DRM device

 * @dev: DRM device

include/drm/drm_connector.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -282,6 +282,10 @@ enum drm_panel_orientation { 
/* 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

#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65		11

#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER		12

#define DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER		12

/* Additional Colorimetry Options added for DP 1.4a VSC Colorimetry Format */

#define DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED		13

#define DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT		14

#define 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
@@ -1580,6 +1584,7 @@ int drm_connector_attach_vrr_capable_property( 
		struct drm_connector *connector);

		struct drm_connector *connector);

int drm_mode_create_aspect_ratio_property(struct drm_device *dev);

int drm_mode_create_aspect_ratio_property(struct drm_device *dev);

int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector);

int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector);

int drm_mode_create_dp_colorspace_property(struct drm_connector *connector);

int drm_mode_create_content_type_property(struct drm_device *dev);

int drm_mode_create_content_type_property(struct drm_device *dev);

void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,

void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,

					 const struct drm_connector_state *conn_state);

					 const struct drm_connector_state *conn_state);