Commit c627087c authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/connector: Use common colorspace_names array 



We an use bitfields to track the support ones for HDMI
and DP. This allows us to print colorspaces in a consistent
manner without needing to know whether we're dealing with
DP or HDMI.

v4:
- Rename _MAX to _COUNT and leave comment to indicate
  it's not a valid value
- Fix misplaced function doc

v6:
- Drop magic in drm_mode_create_colorspace_property for
  dealing with "0" supported_colorspaces. Expect the caller
  to always provide a non-zero supported_colorspaces.
- Improve error checking and logging

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarSebastian Wick <sebastian.wick@redhat.com>
Reviewed-by: default avatarJoshua Ashton <joshua@froggi.es>
Reviewed-by: default avatarSimon Ser <contact@emersion.fr>

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: Jani Nikula <jani.nikula@linux.intel.com>
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 6120611a

drivers/gpu/drm/drm_connector.c

+77 −53
Original line number Diff line number Diff line
@@ -1055,64 +1055,70 @@ static const struct drm_prop_enum_list drm_dp_subconnector_enum_list[] = { 
DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name,

		 drm_dp_subconnector_enum_list)



static const struct drm_prop_enum_list hdmi_colorspaces[] = {



static const char * const colorspace_names[] = {

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

	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },

	[DRM_MODE_COLORIMETRY_DEFAULT] = "Default",

	/* Standard Definition Colorimetry based on CEA 861 */

	{ DRM_MODE_COLORIMETRY_SMPTE_170M_YCC, "SMPTE_170M_YCC" },

	{ DRM_MODE_COLORIMETRY_BT709_YCC, "BT709_YCC" },

	[DRM_MODE_COLORIMETRY_SMPTE_170M_YCC] = "SMPTE_170M_YCC",

	[DRM_MODE_COLORIMETRY_BT709_YCC] = "BT709_YCC",

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

	{ DRM_MODE_COLORIMETRY_XVYCC_601, "XVYCC_601" },

	[DRM_MODE_COLORIMETRY_XVYCC_601] = "XVYCC_601",

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

	{ DRM_MODE_COLORIMETRY_XVYCC_709, "XVYCC_709" },

	[DRM_MODE_COLORIMETRY_XVYCC_709] = "XVYCC_709",

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

	{ DRM_MODE_COLORIMETRY_SYCC_601, "SYCC_601" },

	[DRM_MODE_COLORIMETRY_SYCC_601] = "SYCC_601",

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

	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },

	[DRM_MODE_COLORIMETRY_OPYCC_601] = "opYCC_601",

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

	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },

	[DRM_MODE_COLORIMETRY_OPRGB] = "opRGB",

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

	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },

	[DRM_MODE_COLORIMETRY_BT2020_CYCC] = "BT2020_CYCC",

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

	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },

	[DRM_MODE_COLORIMETRY_BT2020_RGB] = "BT2020_RGB",

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

	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },

	[DRM_MODE_COLORIMETRY_BT2020_YCC] = "BT2020_YCC",

	/* Added as part of Additional Colorimetry Extension in 861.G */

	{ DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65, "DCI-P3_RGB_D65" },

	{ DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER, "DCI-P3_RGB_Theater" },

	[DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65] = "DCI-P3_RGB_D65",

	[DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER] = "DCI-P3_RGB_Theater",

	[DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED] = "RGB_WIDE_FIXED",

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

	[DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT] = "RGB_WIDE_FLOAT",

	[DRM_MODE_COLORIMETRY_BT601_YCC] = "BT601_YCC",

};



static const u32 hdmi_colorspaces =

	BIT(DRM_MODE_COLORIMETRY_SMPTE_170M_YCC) |

	BIT(DRM_MODE_COLORIMETRY_BT709_YCC) |

	BIT(DRM_MODE_COLORIMETRY_XVYCC_601) |

	BIT(DRM_MODE_COLORIMETRY_XVYCC_709) |

	BIT(DRM_MODE_COLORIMETRY_SYCC_601) |

	BIT(DRM_MODE_COLORIMETRY_OPYCC_601) |

	BIT(DRM_MODE_COLORIMETRY_OPRGB) |

	BIT(DRM_MODE_COLORIMETRY_BT2020_CYCC) |

	BIT(DRM_MODE_COLORIMETRY_BT2020_RGB) |

	BIT(DRM_MODE_COLORIMETRY_BT2020_YCC) |

	BIT(DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65) |

	BIT(DRM_MODE_COLORIMETRY_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" },

};

static const u32 dp_colorspaces =

	BIT(DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED) |

	BIT(DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT) |

	BIT(DRM_MODE_COLORIMETRY_OPRGB) |

	BIT(DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65) |

	BIT(DRM_MODE_COLORIMETRY_BT2020_RGB) |

	BIT(DRM_MODE_COLORIMETRY_BT601_YCC) |

	BIT(DRM_MODE_COLORIMETRY_BT709_YCC) |

	BIT(DRM_MODE_COLORIMETRY_XVYCC_601) |

	BIT(DRM_MODE_COLORIMETRY_XVYCC_709) |

	BIT(DRM_MODE_COLORIMETRY_SYCC_601) |

	BIT(DRM_MODE_COLORIMETRY_OPYCC_601) |

	BIT(DRM_MODE_COLORIMETRY_BT2020_CYCC) |

	BIT(DRM_MODE_COLORIMETRY_BT2020_YCC);



/**

 * DOC: standard connector properties
@@ -2136,27 +2142,49 @@ EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); 
 */



static int drm_mode_create_colorspace_property(struct drm_connector *connector,

					const struct drm_prop_enum_list *colorspaces,

					int size)

					u32 supported_colorspaces)

{

	struct drm_device *dev = connector->dev;

	u32 colorspaces = supported_colorspaces | BIT(DRM_MODE_COLORIMETRY_DEFAULT);

	struct drm_prop_enum_list enum_list[DRM_MODE_COLORIMETRY_COUNT];

	int i, len;



	if (connector->colorspace_property)

		return 0;



	if (!colorspaces)

		return 0;

	if (!supported_colorspaces) {

		drm_err(dev, "No supported colorspaces provded on [CONNECTOR:%d:%s]\n",

			    connector->base.id, connector->name);

		return -EINVAL;

	}



	if ((supported_colorspaces & -BIT(DRM_MODE_COLORIMETRY_COUNT)) != 0) {

		drm_err(dev, "Unknown colorspace provded on [CONNECTOR:%d:%s]\n",

			    connector->base.id, connector->name);

		return -EINVAL;

	}



	len = 0;

	for (i = 0; i < DRM_MODE_COLORIMETRY_COUNT; i++) {

		if ((colorspaces & BIT(i)) == 0)

			continue;



		enum_list[len].type = i;

		enum_list[len].name = colorspace_names[i];

		len++;

	}



	connector->colorspace_property =

		drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, "Colorspace",

					colorspaces,

					size);

					enum_list,

					len);



	if (!connector->colorspace_property)

		return -ENOMEM;



	return 0;

}



/**

 * drm_mode_create_hdmi_colorspace_property - create hdmi colorspace property

 * @connector: connector to create the Colorspace property on.
@@ -2169,9 +2197,7 @@ static int drm_mode_create_colorspace_property(struct drm_connector *connector, 
 */

int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector)

{

	return drm_mode_create_colorspace_property(connector,

						   hdmi_colorspaces,

						   ARRAY_SIZE(hdmi_colorspaces));

	return drm_mode_create_colorspace_property(connector, hdmi_colorspaces);

}

EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property);
@@ -2187,9 +2213,7 @@ EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property); 
 */

int drm_mode_create_dp_colorspace_property(struct drm_connector *connector)

{

	return drm_mode_create_colorspace_property(connector,

						   dp_colorspaces,

						   ARRAY_SIZE(dp_colorspaces));

	return drm_mode_create_colorspace_property(connector, dp_colorspaces);

}

EXPORT_SYMBOL(drm_mode_create_dp_colorspace_property);

include/drm/drm_connector.h

+2 −0
Original line number Diff line number Diff line
@@ -516,6 +516,8 @@ enum drm_colorspace { 
	DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED	= 13,

	DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT	= 14,

	DRM_MODE_COLORIMETRY_BT601_YCC		= 15,

	/* not a valid value; merely used for counting */

	DRM_MODE_COLORIMETRY_COUNT

};



/**