From 849041b3fe2b188797c6fd7c6e4faf5d999cf70a Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Wed, 22 Jan 2020 15:15:58 -0800 Subject: [PATCH] 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 --- msm/dp/dp_debug.c | 4 ++-- msm/dp/dp_panel.c | 2 +- msm/sde/sde_connector.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/msm/dp/dp_debug.c b/msm/dp/dp_debug.c index 7cd9a571da..2acdffb4a6 100644 --- a/msm/dp/dp_debug.c +++ b/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 @@ -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; diff --git a/msm/dp/dp_panel.c b/msm/dp/dp_panel.c index 885a8d6d61..7d45605e88 100644 --- a/msm/dp/dp_panel.c +++ b/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; diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c index 16c566779a..0c2f6f8dbe 100644 --- a/msm/sde/sde_connector.c +++ b/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);