Forráskód Böngészése

disp: msm: replace usage of drm_connector with sde_connector for hdr10+

Since the VSVDB parsing has been moved to the sde edid parser, replace
the usage of drm_connector with sde_connector for hdr10+ so that the
modifications to drm_connector can be removed.

Change-Id: I7d69aa533e71fa45bfc578db24c17bb23e499c4a
Signed-off-by: Abhinav Kumar <[email protected]>
Abhinav Kumar 5 éve
szülő
commit
849041b3fe
3 módosított fájl, 5 hozzáadás és 5 törlés
  1. 2 2
      msm/dp/dp_debug.c
  2. 1 1
      msm/dp/dp_panel.c
  3. 2 2
      msm/sde/sde_connector.c

+ 2 - 2
msm/dp/dp_debug.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/debugfs.h>
@@ -1382,7 +1382,7 @@ static int dp_debug_print_hdr_params_to_buf(struct drm_connector *connector,
 		goto error;
 
 	rc = snprintf(buf + len, max_size, "hdr_plus_app_ver = %d\n",
-		connector->hdr_plus_app_ver);
+			c_conn->hdr_plus_app_ver);
 	if (dp_debug_check_buffer_overflow(rc, &max_size, &len))
 		goto error;
 

+ 1 - 1
msm/dp/dp_panel.c

@@ -2319,7 +2319,7 @@ static int dp_panel_deinit_panel_info(struct dp_panel *dp_panel, u32 flags)
 	connector->hdr_avg_luminance = 0;
 	connector->hdr_min_luminance = 0;
 	connector->hdr_supported = false;
-	connector->hdr_plus_app_ver = 0;
+	sde_conn->hdr_plus_app_ver = 0;
 
 	sde_conn->colorspace_updated = false;
 

+ 2 - 2
msm/sde/sde_connector.c

@@ -1225,7 +1225,7 @@ static int _sde_connector_set_ext_hdr_info(
 	if (!hdr_meta->hdr_plus_payload_size || !hdr_meta->hdr_plus_payload)
 		goto skip_dhdr;
 
-	if (!connector->hdr_plus_app_ver) {
+	if (!c_conn->hdr_plus_app_ver) {
 		SDE_ERROR_CONN(c_conn, "sink doesn't support dynamic HDR\n");
 		rc = -ENOTSUPP;
 		goto end;
@@ -1521,7 +1521,7 @@ static void sde_connector_update_hdr_props(struct drm_connector *connector)
 	hdr.hdr_max_luminance = connector->hdr_max_luminance;
 	hdr.hdr_avg_luminance = connector->hdr_avg_luminance;
 	hdr.hdr_min_luminance = connector->hdr_min_luminance;
-	hdr.hdr_plus_supported = connector->hdr_plus_app_ver;
+	hdr.hdr_plus_supported = c_conn->hdr_plus_app_ver;
 
 	msm_property_set_blob(&c_conn->property_info, &c_conn->blob_ext_hdr,
 			&hdr, sizeof(hdr), CONNECTOR_PROP_EXT_HDR_INFO);