Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 849041b3 authored by Abhinav Kumar's avatar Abhinav Kumar Committed by Gerrit - the friendly Code Review server
Browse files

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: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
parent 28ccb5f9

msm/dp/dp_debug.c

+2 −2
Original line number Diff line number Diff line 
// 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;

msm/dp/dp_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

msm/sde/sde_connector.c

+2 −2
Original line number Diff line number Diff line
@@ -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);