Merge branch 'peter/ti-linux-4.4.y/topic/display' of https://github.com/omap-audio/linux-audio into audio-display-ti-linux-4.4.y

Hotplug detection for 2016.04

* 'peter/ti-linux-4.4.y/topic/display' of https://github.com/omap-audio/linux-audio:
  ARM: dts: am437x-gp-evm-hdmi: Add interrupt information for sii9022
  drm/omap: displays: encoder-sii9022: Support for omapdrm HPD detection
  drm/omap: displays: encoder-sii9022: Clean up hpd and interrupt handling
  drm/omap: displays: encoder-sii9022: Simplify the HPD/RXsense reading
  drm/omap: displays: encoder-sii9022: Enable host interrupts when needed
  drm/omap: displays: encoder-sii9022: Add bit definition for IRQ EN/STAT
  drm/omap: displays: dra7-evm-encoder-tpd12s015: Support for hot plug detection
  drm/omap: displays: encoder-tpd12s015: Support for hot plug detection
  drm/omap: displays: connector-hdmi: Support for hot plug detection
  drm/omap: Support for HDMI hot plug detection
  omap/drm: omap_drv: connector type translation for DSI
  drm/omap: poll only connectors where the connect/disconnect can be checked

Author: Jyri Sarha

arch/arm/boot/dts/am437x-gp-evm-hdmi.dts

@@ -62,6 +62,9 @@
 		compatible = "sil,sii9022";
 		reg = <0x3b>;
 
+		interrupt-parent = <&gpio3>;
+		interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
+
 		i2s-fifo-routing = <
 			(ENABLE_BIT|CONNECT_SD0)
 			0

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/spinlock.h>
 
 #include <drm/drm_edid.h>
 
@@ -39,6 +40,9 @@ static const struct omap_video_timings hdmic_default_timings = {
 struct panel_drv_data {
 	struct omap_dss_device dssdev;
 	struct omap_dss_device *in;
+	void (*hpd_cb)(void *cb_data, enum drm_connector_status status);
+	void *hpd_cb_data;
+	struct mutex hpd_lock;
 
 	struct device *dev;
 
@@ -169,6 +173,32 @@ static bool hdmic_detect(struct omap_dss_device *dssdev)
 		return in->ops.hdmi->detect(in);
 }
 
+static int hdmic_enable_hpd(struct omap_dss_device *dssdev,
+			     void (*cb)(void *cb_data,
+					enum drm_connector_status status),
+			     void *cb_data)
+{
+	struct panel_drv_data *ddata = to_panel_data(dssdev);
+	struct omap_dss_device *in = ddata->in;
+
+	if (gpio_is_valid(ddata->hpd_gpio)) {
+		mutex_lock(&ddata->hpd_lock);
+		ddata->hpd_cb = cb;
+		ddata->hpd_cb_data = cb_data;
+		mutex_unlock(&ddata->hpd_lock);
+		return 0;
+	} else if (in->ops.hdmi->enable_hpd) {
+		return in->ops.hdmi->enable_hpd(in, cb, cb_data);
+	}
+
+	return -ENOTSUPP;
+}
+
+static void hdmic_disable_hpd(struct omap_dss_device *dssdev)
+{
+	hdmic_enable_hpd(dssdev, NULL, NULL);
+}
+
 static int hdmic_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode)
 {
 	struct panel_drv_data *ddata = to_panel_data(dssdev);
@@ -201,10 +231,32 @@ static struct omap_dss_driver hdmic_driver = {
 
 	.read_edid		= hdmic_read_edid,
 	.detect			= hdmic_detect,
+	.enable_hpd		= hdmic_enable_hpd,
+	.disable_hpd		= hdmic_disable_hpd,
 	.set_hdmi_mode		= hdmic_set_hdmi_mode,
 	.set_hdmi_infoframe	= hdmic_set_infoframe,
 };
 
+static irqreturn_t hdmic_hpd_isr(int irq, void *data)
+{
+	struct panel_drv_data *ddata = data;
+
+	mutex_lock(&ddata->hpd_lock);
+	if (ddata->hpd_cb) {
+		enum drm_connector_status status;
+
+		if (hdmic_detect(&ddata->dssdev))
+			status = connector_status_connected;
+		else
+			status = connector_status_disconnected;
+
+		ddata->hpd_cb(ddata->hpd_cb_data, status);
+	}
+	mutex_unlock(&ddata->hpd_lock);
+
+	return IRQ_HANDLED;
+}
+
 static int hdmic_probe_of(struct platform_device *pdev)
 {
 	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -250,11 +302,22 @@ static int hdmic_probe(struct platform_device *pdev)
 	if (r)
 		return r;
 
+	mutex_init(&ddata->hpd_lock);
+
 	if (gpio_is_valid(ddata->hpd_gpio)) {
 		r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio,
 				GPIOF_DIR_IN, "hdmi_hpd");
 		if (r)
 			goto err_reg;
+
+		r = devm_request_threaded_irq(&pdev->dev,
+				gpio_to_irq(ddata->hpd_gpio),
+				NULL, hdmic_hpd_isr,
+				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
+				IRQF_ONESHOT,
+				"hdmic hpd", ddata);
+		if (r)
+			goto err_reg;
 	}
 
 	ddata->timings = hdmic_default_timings;

drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.c

@@ -21,6 +21,7 @@
 #include <linux/suspend.h>
 #include <linux/of_platform.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/spinlock.h>
 
 #include "../dss/omapdss.h"
 
@@ -37,6 +38,9 @@ int dra7_mcasp_hdmi_gpio_set(struct platform_device *pdev, bool high);
 struct panel_drv_data {
 	struct omap_dss_device dssdev;
 	struct omap_dss_device *in;
+	void (*hpd_cb)(void *cb_data, enum drm_connector_status status);
+	void *hpd_cb_data;
+	struct mutex hpd_lock;
 
 	int ct_cp_hpd_gpio;
 	int ls_oe_gpio;
@@ -271,7 +275,26 @@ static bool tpd_detect(struct omap_dss_device *dssdev)
 	struct panel_drv_data *ddata = to_panel_data(dssdev);
 
 	return gpio_get_value_cansleep(ddata->hpd_gpio);
+}
+
+static int tpd_enable_hpd(struct omap_dss_device *dssdev,
+			   void (*cb)(void *cb_data,
+				      enum drm_connector_status status),
+			   void *cb_data)
+{
+	struct panel_drv_data *ddata = to_panel_data(dssdev);
+
+	mutex_lock(&ddata->hpd_lock);
+	ddata->hpd_cb = cb;
+	ddata->hpd_cb_data = cb_data;
+	mutex_unlock(&ddata->hpd_lock);
 
+	return 0;
+}
+
+static void tpd_disable_hpd(struct omap_dss_device *dssdev)
+{
+	tpd_enable_hpd(dssdev, NULL, NULL);
 }
 
 static int tpd_set_infoframe(struct omap_dss_device *dssdev,
@@ -305,10 +328,32 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = {
 
 	.read_edid		= tpd_read_edid,
 	.detect			= tpd_detect,
+	.enable_hpd		= tpd_enable_hpd,
+	.disable_hpd		= tpd_disable_hpd,
 	.set_infoframe		= tpd_set_infoframe,
 	.set_hdmi_mode		= tpd_set_hdmi_mode,
 };
 
+static irqreturn_t tpd_hpd_isr(int irq, void *data)
+{
+	struct panel_drv_data *ddata = data;
+
+	mutex_lock(&ddata->hpd_lock);
+	if (ddata->hpd_cb) {
+		enum drm_connector_status status;
+
+		if (tpd_detect(&ddata->dssdev))
+			status = connector_status_connected;
+		else
+			status = connector_status_disconnected;
+
+		ddata->hpd_cb(ddata->hpd_cb_data, status);
+	}
+	mutex_unlock(&ddata->hpd_lock);
+
+	return IRQ_HANDLED;
+}
+
 static int tpd_probe_of(struct platform_device *pdev)
 {
 	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -457,6 +502,15 @@ static int tpd_probe(struct platform_device *pdev)
 	if (r)
 		goto err_debounce;
 
+	mutex_init(&ddata->hpd_lock);
+
+	r = devm_request_threaded_irq(&pdev->dev, gpio_to_irq(ddata->hpd_gpio),
+		NULL, tpd_hpd_isr,
+		IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+		"tpd12s015 hpd", ddata);
+	if (r)
+		goto err_debounce;
+
 	dssdev = &ddata->dssdev;
 	dssdev->ops.hdmi = &tpd_hdmi_ops;
 	dssdev->dev = &pdev->dev;