Browse Source

Merge "disp: msm: remove drm_connector usage for colorspace"

qctecmdr 5 years ago
parent
commit
664e64b84b
2 changed files with 5 additions and 2 deletions
  1. 3 1
      msm/dp/dp_display.c
  2. 2 1
      msm/sde/sde_connector.c

+ 3 - 1
msm/dp/dp_display.c

@@ -1827,9 +1827,11 @@ end:
 static void dp_display_clear_colorspaces(struct dp_display *dp_display)
 {
 	struct drm_connector *connector;
+	struct sde_connector *sde_conn;
 
 	connector = dp_display->base_connector;
-	connector->color_enc_fmt = 0;
+	sde_conn = to_sde_connector(connector);
+	sde_conn->color_enc_fmt = 0;
 }
 
 static int dp_display_pre_disable(struct dp_display *dp_display, void *panel)

+ 2 - 1
msm/sde/sde_connector.c

@@ -1527,12 +1527,13 @@ static void sde_connector_update_hdr_props(struct drm_connector *connector)
 static void sde_connector_update_colorspace(struct drm_connector *connector)
 {
 	int ret;
+	struct sde_connector *c_conn = to_sde_connector(connector);
 
 	ret = msm_property_set_property(
 			sde_connector_get_propinfo(connector),
 			sde_connector_get_property_state(connector->state),
 			CONNECTOR_PROP_SUPPORTED_COLORSPACES,
-				connector->color_enc_fmt);
+				c_conn->color_enc_fmt);
 
 	if (ret)
 		SDE_ERROR("failed to set colorspace property for connector\n");