Merge "Revert "disp: msm: sde: remove colorspace property from connector""

This commit is contained in:
qctecmdr
2020-03-03 09:08:48 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -2385,6 +2385,7 @@ static int _sde_connector_install_properties(struct drm_device *dev,
{ {
struct dsi_display *dsi_display; struct dsi_display *dsi_display;
int rc; int rc;
struct drm_connector *connector;
msm_property_install_blob(&c_conn->property_info, "capabilities", msm_property_install_blob(&c_conn->property_info, "capabilities",
DRM_MODE_PROP_IMMUTABLE, CONNECTOR_PROP_SDE_INFO); DRM_MODE_PROP_IMMUTABLE, CONNECTOR_PROP_SDE_INFO);
@@ -2397,6 +2398,8 @@ static int _sde_connector_install_properties(struct drm_device *dev,
return rc; return rc;
} }
connector = &c_conn->base;
msm_property_install_blob(&c_conn->property_info, "mode_properties", msm_property_install_blob(&c_conn->property_info, "mode_properties",
DRM_MODE_PROP_IMMUTABLE, CONNECTOR_PROP_MODE_INFO); DRM_MODE_PROP_IMMUTABLE, CONNECTOR_PROP_MODE_INFO);
@@ -2440,6 +2443,11 @@ static int _sde_connector_install_properties(struct drm_device *dev,
&hdr, &hdr,
sizeof(hdr), sizeof(hdr),
CONNECTOR_PROP_EXT_HDR_INFO); CONNECTOR_PROP_EXT_HDR_INFO);
/* create and attach colorspace property for DP */
if (!drm_mode_create_colorspace_property(connector))
drm_object_attach_property(&connector->base,
connector->colorspace_property, 0);
} }
msm_property_install_volatile_range(&c_conn->property_info, msm_property_install_volatile_range(&c_conn->property_info,