Merge "msm: ext_display: move ext_display out of FB driver"

3 files changed, 2 insertions, 884 deletions

diff --git a/drivers/video/fbdev/msm/Kconfig b/drivers/video/fbdev/msm/Kconfig
index ef5c96214c19..03ee89ad0d99 100644
--- a/drivers/video/fbdev/msm/Kconfig
+++ b/drivers/video/fbdev/msm/Kconfig
@@ -63,6 +63,7 @@ config FB_MSM_MDSS_WRITEBACK
 
 config FB_MSM_MDSS_HDMI_PANEL
 	depends on FB_MSM_MDSS
+	select MSM_EXT_DISPLAY
 	bool "MDSS HDMI Tx Panel"
 	default n
 	---help---
@@ -98,6 +99,7 @@ config FB_MSM_MDSS_DSI_CTRL_STATUS
 
 config FB_MSM_MDSS_DP_PANEL
 	depends on FB_MSM_MDSS
+	select MSM_EXT_DISPLAY
 	bool "MDSS DP Panel"
 	---help---
 	The MDSS DP Panel provides support for DP host controller driver
diff --git a/drivers/video/fbdev/msm/Makefile b/drivers/video/fbdev/msm/Makefile
index b905c0e855dd..e101b873f361 100644
--- a/drivers/video/fbdev/msm/Makefile
+++ b/drivers/video/fbdev/msm/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_FB_MSM_MDSS_DP_PANEL) += mdss_dp_aux.o
 obj-$(CONFIG_FB_MSM_MDSS_DP_PANEL) += mdss_dp_hdcp2p2.o
 
 obj-$(CONFIG_FB_MSM_MDSS) += mdss_io_util.o
-obj-$(CONFIG_FB_MSM_MDSS) += msm_ext_display.o
 obj-$(CONFIG_FB_MSM_MDSS_HDMI_PANEL) += mdss_hdmi_tx.o
 obj-$(CONFIG_FB_MSM_MDSS_HDMI_PANEL) += mdss_hdmi_panel.o
 obj-$(CONFIG_FB_MSM_MDSS_HDMI_PANEL) += mdss_hdmi_hdcp2p2.o
diff --git a/drivers/video/fbdev/msm/msm_ext_display.c b/drivers/video/fbdev/msm/msm_ext_display.c
deleted file mode 100644
index 7be6b491d374..000000000000
--- a/drivers/video/fbdev/msm/msm_ext_display.c
+++ /dev/null
@@ -1,883 +0,0 @@
-/* Copyright (c) 2016-2017, 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
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define pr_fmt(fmt)	"%s: " fmt, __func__
-
-#include <linux/slab.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/iopoll.h>
-#include <linux/types.h>
-#include <linux/switch.h>
-#include <linux/of_platform.h>
-#include <linux/msm_ext_display.h>
-
-struct msm_ext_disp_list {
-	struct msm_ext_disp_init_data *data;
-	struct list_head list;
-};
-
-struct msm_ext_disp {
-	struct platform_device *pdev;
-	enum msm_ext_disp_type current_disp;
-	struct msm_ext_disp_audio_codec_ops *ops;
-	struct switch_dev hdmi_sdev;
-	struct switch_dev audio_sdev;
-	bool ack_enabled;
-	bool audio_session_on;
-	struct list_head display_list;
-	struct mutex lock;
-	struct completion hpd_comp;
-	u32 flags;
-};
-
-static int msm_ext_disp_get_intf_data(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type,
-		struct msm_ext_disp_init_data **data);
-static int msm_ext_disp_update_audio_ops(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type,
-		enum msm_ext_disp_cable_state state, u32 flags);
-
-static int msm_ext_disp_switch_dev_register(struct msm_ext_disp *ext_disp)
-{
-	int ret = 0;
-
-	if (!ext_disp) {
-		pr_err("Invalid params\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	memset(&ext_disp->hdmi_sdev, 0x0, sizeof(ext_disp->hdmi_sdev));
-	ext_disp->hdmi_sdev.name = "hdmi";
-	ret = switch_dev_register(&ext_disp->hdmi_sdev);
-	if (ret) {
-		pr_err("hdmi switch registration failed\n");
-		goto end;
-	}
-
-	memset(&ext_disp->audio_sdev, 0x0, sizeof(ext_disp->audio_sdev));
-	ext_disp->audio_sdev.name = "hdmi_audio";
-	ret = switch_dev_register(&ext_disp->audio_sdev);
-	if (ret) {
-		pr_err("hdmi_audio switch registration failed");
-		goto hdmi_audio_failure;
-	}
-
-	pr_debug("Display switch registration pass\n");
-
-	return ret;
-
-hdmi_audio_failure:
-	switch_dev_unregister(&ext_disp->hdmi_sdev);
-end:
-	return ret;
-}
-
-static void msm_ext_disp_switch_dev_unregister(struct msm_ext_disp *ext_disp)
-{
-	if (!ext_disp) {
-		pr_err("Invalid params\n");
-		goto end;
-	}
-
-	switch_dev_unregister(&ext_disp->hdmi_sdev);
-	switch_dev_unregister(&ext_disp->audio_sdev);
-
-end:
-	return;
-}
-
-static const char *msm_ext_disp_name(enum msm_ext_disp_type type)
-{
-	switch (type) {
-	case EXT_DISPLAY_TYPE_HDMI:	return "EXT_DISPLAY_TYPE_HDMI";
-	case EXT_DISPLAY_TYPE_DP:	return "EXT_DISPLAY_TYPE_DP";
-	default: return "???";
-	}
-}
-
-static int msm_ext_disp_add_intf_data(struct msm_ext_disp *ext_disp,
-		struct msm_ext_disp_init_data *data)
-{
-	struct msm_ext_disp_list *node;
-
-	if (!ext_disp && !data) {
-		pr_err("Invalid params\n");
-		return -EINVAL;
-	}
-
-	node = kzalloc(sizeof(*node), GFP_KERNEL);
-	if (!node)
-		return -ENOMEM;
-
-	node->data = data;
-	list_add(&node->list, &ext_disp->display_list);
-
-	pr_debug("Added new display (%s)\n",
-			msm_ext_disp_name(data->type));
-
-	return 0;
-}
-
-static int msm_ext_disp_get_intf_data(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type,
-		struct msm_ext_disp_init_data **data)
-{
-	int ret = 0;
-	struct msm_ext_disp_list *node;
-	struct list_head *position = NULL;
-
-	if (!ext_disp || !data || type < EXT_DISPLAY_TYPE_HDMI ||
-			type >=  EXT_DISPLAY_TYPE_MAX) {
-		pr_err("Invalid params\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	*data = NULL;
-	list_for_each(position, &ext_disp->display_list) {
-		node = list_entry(position, struct msm_ext_disp_list, list);
-		if (node->data->type == type) {
-			pr_debug("Found display (%s)\n",
-					msm_ext_disp_name(type));
-			*data = node->data;
-			break;
-		}
-	}
-
-	if (!*data) {
-		pr_debug("Display not found (%s)\n",
-				msm_ext_disp_name(type));
-		ret = -ENODEV;
-	}
-
-end:
-	return ret;
-}
-
-static int msm_ext_disp_send_cable_notification(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_cable_state new_state)
-{
-	int state = EXT_DISPLAY_CABLE_STATE_MAX;
-
-	if (!ext_disp) {
-		pr_err("Invalid params\n");
-		return -EINVAL;
-	}
-
-	state = ext_disp->hdmi_sdev.state;
-	switch_set_state(&ext_disp->hdmi_sdev, !!new_state);
-
-	pr_debug("Cable state %s %d\n",
-			ext_disp->hdmi_sdev.state == state ?
-			"is same" : "switched to",
-			ext_disp->hdmi_sdev.state);
-
-	return ext_disp->hdmi_sdev.state == state ? 0 : 1;
-}
-
-static int msm_ext_disp_send_audio_notification(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_cable_state new_state)
-{
-	int state = EXT_DISPLAY_CABLE_STATE_MAX;
-
-	if (!ext_disp) {
-		pr_err("Invalid params\n");
-		return -EINVAL;
-	}
-
-	state = ext_disp->audio_sdev.state;
-	switch_set_state(&ext_disp->audio_sdev, !!new_state);
-
-	pr_debug("Audio state %s %d\n",
-			ext_disp->audio_sdev.state == state ?
-			"is same" : "switched to",
-			ext_disp->audio_sdev.state);
-
-	return ext_disp->audio_sdev.state == state ? 0 : 1;
-}
-
-static int msm_ext_disp_process_display(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type,
-		enum msm_ext_disp_cable_state state, u32 flags)
-{
-	int ret = 0;
-
-	if (!(flags & MSM_EXT_DISP_HPD_VIDEO)) {
-		pr_debug("skipping video setup for display (%s)\n",
-			msm_ext_disp_name(type));
-		goto end;
-	}
-
-	ret = msm_ext_disp_send_cable_notification(ext_disp, state);
-
-	/* positive ret value means audio node was switched */
-	if (IS_ERR_VALUE(ret) || !ret) {
-		pr_debug("not waiting for display\n");
-		goto end;
-	}
-
-	reinit_completion(&ext_disp->hpd_comp);
-	ret = wait_for_completion_timeout(&ext_disp->hpd_comp, HZ * 5);
-	if (!ret) {
-		pr_err("display timeout\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	ret = 0;
-end:
-	return ret;
-}
-
-static int msm_ext_disp_process_audio(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type,
-		enum msm_ext_disp_cable_state state, u32 flags)
-{
-	int ret = 0;
-
-	if (!(flags & MSM_EXT_DISP_HPD_AUDIO)) {
-		pr_debug("skipping audio setup for display (%s)\n",
-			msm_ext_disp_name(type));
-		goto end;
-	}
-
-	ret = msm_ext_disp_send_audio_notification(ext_disp, state);
-
-	/* positive ret value means audio node was switched */
-	if (IS_ERR_VALUE(ret) || !ret || !ext_disp->ack_enabled) {
-		pr_debug("not waiting for audio\n");
-		goto end;
-	}
-
-	reinit_completion(&ext_disp->hpd_comp);
-	ret = wait_for_completion_timeout(&ext_disp->hpd_comp, HZ * 2);
-	if (!ret) {
-		pr_err("audio timeout\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	ret = 0;
-end:
-	return ret;
-}
-
-static bool msm_ext_disp_validate_connect(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type, u32 flags)
-{
-	/* allow new connections */
-	if (ext_disp->current_disp == EXT_DISPLAY_TYPE_MAX)
-		goto end;
-
-	/* if already connected, block a new connection  */
-	if (ext_disp->current_disp != type)
-		return false;
-
-	/* if same display connected, block same connection type */
-	if (ext_disp->flags & flags)
-		return false;
-
-end:
-	ext_disp->flags |= flags;
-	ext_disp->current_disp = type;
-	return true;
-}
-
-static bool msm_ext_disp_validate_disconnect(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type, u32 flags)
-{
-	/* check if nothing connected */
-	if (ext_disp->current_disp == EXT_DISPLAY_TYPE_MAX)
-		return false;
-
-	/* check if a different display's request */
-	if (ext_disp->current_disp != type)
-		return false;
-
-	/* allow only an already connected type  */
-	if (ext_disp->flags & flags) {
-		ext_disp->flags &= ~flags;
-		return true;
-	}
-
-	return false;
-}
-
-static int msm_ext_disp_hpd(struct platform_device *pdev,
-		enum msm_ext_disp_type type,
-		enum msm_ext_disp_cable_state state,
-		u32 flags)
-{
-	int ret = 0;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev) {
-		pr_err("Invalid platform device\n");
-		return -EINVAL;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("Invalid drvdata\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&ext_disp->lock);
-
-	pr_debug("HPD for display (%s), NEW STATE = %d, flags = %d\n",
-			msm_ext_disp_name(type), state, flags);
-
-	if (state < EXT_DISPLAY_CABLE_DISCONNECT ||
-			state >= EXT_DISPLAY_CABLE_STATE_MAX) {
-		pr_err("Invalid HPD state (%d)\n", state);
-		ret = -EINVAL;
-		goto end;
-	}
-
-	if (state == EXT_DISPLAY_CABLE_CONNECT) {
-		if (!msm_ext_disp_validate_connect(ext_disp, type, flags)) {
-			pr_err("Display interface (%s) already connected\n",
-				msm_ext_disp_name(ext_disp->current_disp));
-			ret = -EINVAL;
-			goto end;
-		}
-
-		ret = msm_ext_disp_process_display(ext_disp, type, state,
-			flags);
-		if (ret)
-			goto end;
-
-		ret = msm_ext_disp_update_audio_ops(ext_disp, type, state,
-			flags);
-		if (ret)
-			goto end;
-
-		ret = msm_ext_disp_process_audio(ext_disp, type, state,
-			flags);
-		if (ret)
-			goto end;
-	} else {
-		if (!msm_ext_disp_validate_disconnect(ext_disp, type, flags)) {
-			pr_err("Display interface (%s) not connected\n",
-				msm_ext_disp_name(type));
-			ret = -EINVAL;
-			goto end;
-		}
-
-		msm_ext_disp_process_audio(ext_disp, type, state, flags);
-		msm_ext_disp_update_audio_ops(ext_disp, type, state, flags);
-		msm_ext_disp_process_display(ext_disp, type, state, flags);
-
-		if (!ext_disp->flags)
-			ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX;
-	}
-
-	pr_debug("Hpd (%d) for display (%s)\n", state,
-			msm_ext_disp_name(type));
-
-end:
-	mutex_unlock(&ext_disp->lock);
-
-	return ret;
-}
-static int msm_ext_disp_get_intf_data_helper(struct platform_device *pdev,
-		struct msm_ext_disp_init_data **data)
-{
-	int ret = 0;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev) {
-		pr_err("No platform device\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("No drvdata found\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	if (ext_disp->current_disp == EXT_DISPLAY_TYPE_MAX) {
-		ret = -EINVAL;
-		pr_err("No display connected\n");
-		goto end;
-	}
-
-	ret = msm_ext_disp_get_intf_data(ext_disp, ext_disp->current_disp,
-			data);
-end:
-	return ret;
-}
-
-static int msm_ext_disp_cable_status(struct platform_device *pdev, u32 vote)
-{
-	int ret = 0;
-	struct msm_ext_disp_init_data *data = NULL;
-
-	ret = msm_ext_disp_get_intf_data_helper(pdev, &data);
-	if (ret || !data)
-		goto end;
-
-	ret = data->codec_ops.cable_status(data->pdev, vote);
-
-end:
-	return ret;
-}
-
-static int msm_ext_disp_get_audio_edid_blk(struct platform_device *pdev,
-	struct msm_ext_disp_audio_edid_blk *blk)
-{
-	int ret = 0;
-	struct msm_ext_disp_init_data *data = NULL;
-
-	ret = msm_ext_disp_get_intf_data_helper(pdev, &data);
-	if (ret || !data)
-		goto end;
-
-	ret = data->codec_ops.get_audio_edid_blk(data->pdev, blk);
-
-end:
-	return ret;
-}
-
-static int msm_ext_disp_audio_info_setup(struct platform_device *pdev,
-	struct msm_ext_disp_audio_setup_params *params)
-{
-	int ret = 0;
-	struct msm_ext_disp_init_data *data = NULL;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	ret = msm_ext_disp_get_intf_data_helper(pdev, &data);
-	if (ret || !data)
-		goto end;
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("No drvdata found\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	ext_disp->audio_session_on = true;
-
-	ret = data->codec_ops.audio_info_setup(data->pdev, params);
-
-end:
-	return ret;
-}
-
-static void msm_ext_disp_teardown_done(struct platform_device *pdev)
-{
-	int ret = 0;
-	struct msm_ext_disp_init_data *data = NULL;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	ret = msm_ext_disp_get_intf_data_helper(pdev, &data);
-	if (ret || !data) {
-		pr_err("invalid input");
-		return;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("No drvdata found\n");
-		return;
-	}
-
-	if (data->codec_ops.teardown_done)
-		data->codec_ops.teardown_done(data->pdev);
-
-	ext_disp->audio_session_on = false;
-
-	pr_debug("%s tearing down audio\n",
-		msm_ext_disp_name(ext_disp->current_disp));
-
-	complete_all(&ext_disp->hpd_comp);
-}
-
-static int msm_ext_disp_audio_ack(struct platform_device *pdev, u32 ack)
-{
-	u32 ack_hpd;
-	int ret = 0;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev) {
-		pr_err("Invalid platform device\n");
-		return -EINVAL;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("Invalid drvdata\n");
-		return -EINVAL;
-	}
-
-	if (ack & AUDIO_ACK_SET_ENABLE) {
-		ext_disp->ack_enabled = ack & AUDIO_ACK_ENABLE ?
-			true : false;
-
-		pr_debug("audio ack feature %s\n",
-			ext_disp->ack_enabled ? "enabled" : "disabled");
-		goto end;
-	}
-
-	if (!ext_disp->ack_enabled)
-		goto end;
-
-	ack_hpd = ack & AUDIO_ACK_CONNECT;
-
-	pr_debug("%s acknowledging audio (%d)\n",
-		msm_ext_disp_name(ext_disp->current_disp), ack_hpd);
-
-	if (!ext_disp->audio_session_on)
-		complete_all(&ext_disp->hpd_comp);
-end:
-	return ret;
-}
-
-static int msm_ext_disp_get_intf_id(struct platform_device *pdev)
-{
-	int ret = 0;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev) {
-		pr_err("No platform device\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("No drvdata found\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	ret = ext_disp->current_disp;
-
-end:
-	return ret;
-}
-
-static int msm_ext_disp_update_audio_ops(struct msm_ext_disp *ext_disp,
-		enum msm_ext_disp_type type,
-		enum msm_ext_disp_cable_state state, u32 flags)
-{
-	int ret = 0;
-	struct msm_ext_disp_audio_codec_ops *ops = ext_disp->ops;
-
-	if (!(flags & MSM_EXT_DISP_HPD_AUDIO)) {
-		pr_debug("skipping audio ops setup for display (%s)\n",
-			msm_ext_disp_name(type));
-		goto end;
-	}
-
-	if (!ops) {
-		pr_err("Invalid audio ops\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	if (state == EXT_DISPLAY_CABLE_CONNECT) {
-		ops->audio_info_setup = msm_ext_disp_audio_info_setup;
-		ops->get_audio_edid_blk = msm_ext_disp_get_audio_edid_blk;
-		ops->cable_status = msm_ext_disp_cable_status;
-		ops->get_intf_id = msm_ext_disp_get_intf_id;
-		ops->teardown_done = msm_ext_disp_teardown_done;
-		ops->acknowledge = msm_ext_disp_audio_ack;
-	} else {
-		ops->audio_info_setup = NULL;
-		ops->get_audio_edid_blk = NULL;
-		ops->cable_status = NULL;
-		ops->get_intf_id = NULL;
-		ops->teardown_done = NULL;
-		ops->acknowledge = NULL;
-	}
-end:
-	return ret;
-}
-
-static int msm_ext_disp_notify(struct platform_device *pdev,
-		enum msm_ext_disp_cable_state state)
-{
-	int ret = 0;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev) {
-		pr_err("Invalid platform device\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("Invalid drvdata\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	if (state < EXT_DISPLAY_CABLE_DISCONNECT ||
-	    state >= EXT_DISPLAY_CABLE_STATE_MAX) {
-		pr_err("Invalid state (%d)\n", state);
-		ret = -EINVAL;
-		goto end;
-	}
-
-	pr_debug("%s notifying hpd (%d)\n",
-		msm_ext_disp_name(ext_disp->current_disp), state);
-
-	complete_all(&ext_disp->hpd_comp);
-end:
-	return ret;
-}
-
-int msm_hdmi_register_audio_codec(struct platform_device *pdev,
-	struct msm_ext_disp_audio_codec_ops *ops)
-{
-	return msm_ext_disp_register_audio_codec(pdev, ops);
-}
-
-int msm_ext_disp_register_audio_codec(struct platform_device *pdev,
-		struct msm_ext_disp_audio_codec_ops *ops)
-{
-	int ret = 0;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev || !ops) {
-		pr_err("Invalid params\n");
-		return -EINVAL;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("Invalid drvdata\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&ext_disp->lock);
-
-	if ((ext_disp->current_disp != EXT_DISPLAY_TYPE_MAX)
-			&& ext_disp->ops) {
-		pr_err("Codec already registered\n");
-		ret = -EINVAL;
-		goto end;
-	}
-
-	ext_disp->ops = ops;
-
-	pr_debug("audio codec registered\n");
-
-end:
-	mutex_unlock(&ext_disp->lock);
-
-	return ret;
-}
-
-static int msm_ext_disp_validate_intf(struct msm_ext_disp_init_data *init_data)
-{
-	if (!init_data) {
-		pr_err("Invalid init_data\n");
-		return -EINVAL;
-	}
-
-	if (!init_data->pdev) {
-		pr_err("Invalid display intf pdev\n");
-		return -EINVAL;
-	}
-
-	if (!init_data->codec_ops.get_audio_edid_blk ||
-			!init_data->codec_ops.cable_status ||
-			!init_data->codec_ops.audio_info_setup) {
-		pr_err("Invalid codec operation pointers\n");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-int msm_ext_disp_register_intf(struct platform_device *pdev,
-		struct msm_ext_disp_init_data *init_data)
-{
-	int ret = 0;
-	struct msm_ext_disp_init_data *data = NULL;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev || !init_data) {
-		pr_err("Invalid params\n");
-		return -EINVAL;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("Invalid drvdata\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&ext_disp->lock);
-
-	ret = msm_ext_disp_validate_intf(init_data);
-	if (ret)
-		goto end;
-
-	ret = msm_ext_disp_get_intf_data(ext_disp, init_data->type, &data);
-	if (!ret) {
-		pr_debug("Display (%s) already registered\n",
-				msm_ext_disp_name(init_data->type));
-		goto end;
-	}
-
-	ret = msm_ext_disp_add_intf_data(ext_disp, init_data);
-	if (ret)
-		goto end;
-
-	init_data->intf_ops.hpd = msm_ext_disp_hpd;
-	init_data->intf_ops.notify = msm_ext_disp_notify;
-
-	pr_debug("Display (%s) registered\n",
-			msm_ext_disp_name(init_data->type));
-
-	mutex_unlock(&ext_disp->lock);
-
-	return ret;
-
-end:
-	mutex_unlock(&ext_disp->lock);
-
-	return ret;
-}
-
-static int msm_ext_disp_probe(struct platform_device *pdev)
-{
-	int ret = 0;
-	struct device_node *of_node = NULL;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev) {
-		pr_err("No platform device found\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	of_node = pdev->dev.of_node;
-	if (!of_node) {
-		pr_err("No device node found\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	ext_disp = devm_kzalloc(&pdev->dev, sizeof(*ext_disp), GFP_KERNEL);
-	if (!ext_disp) {
-		ret = -ENOMEM;
-		goto end;
-	}
-
-	platform_set_drvdata(pdev, ext_disp);
-	ext_disp->pdev = pdev;
-
-	ret = msm_ext_disp_switch_dev_register(ext_disp);
-	if (ret)
-		goto switch_dev_failure;
-
-	ret = of_platform_populate(of_node, NULL, NULL, &pdev->dev);
-	if (ret) {
-		pr_err("Failed to add child devices. Error = %d\n", ret);
-		goto child_node_failure;
-	} else {
-		pr_debug("%s: Added child devices.\n", __func__);
-	}
-
-	mutex_init(&ext_disp->lock);
-
-	INIT_LIST_HEAD(&ext_disp->display_list);
-	init_completion(&ext_disp->hpd_comp);
-	ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX;
-
-	return ret;
-
-child_node_failure:
-	msm_ext_disp_switch_dev_unregister(ext_disp);
-switch_dev_failure:
-	devm_kfree(&ext_disp->pdev->dev, ext_disp);
-end:
-	return ret;
-}
-
-static int msm_ext_disp_remove(struct platform_device *pdev)
-{
-	int ret = 0;
-	struct msm_ext_disp *ext_disp = NULL;
-
-	if (!pdev) {
-		pr_err("No platform device\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	ext_disp = platform_get_drvdata(pdev);
-	if (!ext_disp) {
-		pr_err("No drvdata found\n");
-		ret = -ENODEV;
-		goto end;
-	}
-
-	msm_ext_disp_switch_dev_unregister(ext_disp);
-
-	mutex_destroy(&ext_disp->lock);
-	devm_kfree(&ext_disp->pdev->dev, ext_disp);
-
-end:
-	return ret;
-}
-
-static const struct of_device_id msm_ext_dt_match[] = {
-	{.compatible = "qcom,msm-ext-disp",},
-	{ /* Sentinel */ },
-};
-MODULE_DEVICE_TABLE(of, msm_ext_dt_match);
-
-static struct platform_driver this_driver = {
-	.probe = msm_ext_disp_probe,
-	.remove = msm_ext_disp_remove,
-	.driver = {
-		.name = "msm-ext-disp",
-		.of_match_table = msm_ext_dt_match,
-	},
-};
-
-static int __init msm_ext_disp_init(void)
-{
-	int ret = 0;
-
-	ret = platform_driver_register(&this_driver);
-	if (ret)
-		pr_err("failed, ret = %d\n", ret);
-
-	return ret;
-}
-
-static void __exit msm_ext_disp_exit(void)
-{
-	platform_driver_unregister(&this_driver);
-}
-
-module_init(msm_ext_disp_init);
-module_exit(msm_ext_disp_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("MSM External Display");
-