Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
Reviewed-by: Sebastian Wick <sebastian.w...@redhat.com>
Reviewed-by: Joshua Ashton <jos...@froggi.es>

Cc: Pekka Paalanen <ppaala...@gmail.com>
Cc: Sebastian Wick <sebastian.w...@redhat.com>
Cc: vitaly.pros...@amd.com
Cc: Uma Shankar <uma.shan...@intel.com>
Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Cc: Joshua Ashton <jos...@froggi.es>
Cc: Jani Nikula <jani.nik...@linux.intel.com>
Cc: Simon Ser <cont...@emersion.fr>
Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Cc: Melissa Wen <m...@igalia.com>
Cc: dri-de...@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
---
 drivers/gpu/drm/drm_connector.c | 54 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 547356e00341..9c087d6f5691 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -1975,33 +1975,44 @@ EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property);
  * drm_mode_create_dp_colorspace_property() is used for DP connector.
  */
 
-/**
- * drm_mode_create_hdmi_colorspace_property - create hdmi 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
- * HDMI connectors.
- *
- * Returns:
- * Zero on success, negative errno on failure.
- */
-int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector)
+static int drm_mode_create_colorspace_property(struct drm_connector *connector,
+                                       const struct drm_prop_enum_list 
*colorspaces,
+                                       int size)
 {
        struct drm_device *dev = connector->dev;
 
        if (connector->colorspace_property)
                return 0;
 
+       if (!colorspaces)
+               return 0;
+
        connector->colorspace_property =
                drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, "Colorspace",
-                                        hdmi_colorspaces,
-                                        ARRAY_SIZE(hdmi_colorspaces));
+                                       colorspaces,
+                                       size);
 
        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.
+ *
+ * Called by a driver the first time it's needed, must be attached to desired
+ * HDMI connectors.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector)
+{
+       return drm_mode_create_colorspace_property(connector,
+                                                  hdmi_colorspaces,
+                                                  
ARRAY_SIZE(hdmi_colorspaces));
+}
 EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property);
 
 /**
@@ -2016,20 +2027,9 @@ EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property);
  */
 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;
+       return drm_mode_create_colorspace_property(connector,
+                                                  dp_colorspaces,
+                                                  ARRAY_SIZE(dp_colorspaces));
 }
 EXPORT_SYMBOL(drm_mode_create_dp_colorspace_property);
 
-- 
2.41.0

Reply via email to