Merge "drm/msm: add edid parser api" (1245eb26) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/sde_edid_parser.c

+24 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -598,6 +598,26 @@ bool sde_detect_hdmi_monitor(void *input)
		return drm_detect_hdmi_monitor(edid_ctrl->edid);
		}

		void sde_parse_edid(void *input)
		{
		struct sde_edid_ctrl *edid_ctrl;

		if (!input) {
		SDE_ERROR("Invalid input\n");
		return;
		}

		edid_ctrl = (struct sde_edid_ctrl *)(input);

		if (edid_ctrl->edid) {
		sde_edid_extract_vendor_id(edid_ctrl);
		_sde_edid_extract_audio_data_blocks(edid_ctrl);
		_sde_edid_extract_speaker_allocation_data(edid_ctrl);
		} else {
		SDE_ERROR("edid not present\n");
		}
		}

		void sde_get_edid(struct drm_connector *connector,
		struct i2c_adapter adapter, void *input)
		{
		@@ -609,10 +629,8 @@ void sde_get_edid(struct drm_connector *connector,
		if (!edid_ctrl->edid)
		SDE_ERROR("EDID read failed\n");

		if (edid_ctrl->edid) {
		sde_edid_extract_vendor_id(edid_ctrl);
		_sde_edid_extract_audio_data_blocks(edid_ctrl);
		_sde_edid_extract_speaker_allocation_data(edid_ctrl);
		}
		if (edid_ctrl->edid)
		sde_parse_edid(edid_ctrl);

		SDE_EDID_DEBUG("%s -\n", __func__);
		};

+9 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -121,6 +121,14 @@ void sde_get_edid(struct drm_connector *connector,
		struct i2c_adapter *adapter,
		void **edid_ctrl);

		/**
		* sde_parse_edid() - parses edid info.
		* @edid_ctrl: Handle to the edid_ctrl structure.
		*
		* Return: void.
		*/
		void sde_parse_edid(void *edid_ctrl);

		/**
		* sde_free_edid() - free edid structure.
		* @edid_ctrl: Handle to the edid_ctrl structure.