Commit e7e67d9a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: Switch the HDMI and VENC outputs to drm_bridge 



The TPD12S015, OPA362 and analog and HDMI connectors are now supported
by DRM bridge drivers, and the omapdrm HDMI and VENC outputs can be
handled through the drm_bridge API. Switch the outputs to drm_bridge by
making the next bridge mandatory and removing the related
omapdrm-specific display drivers.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226112514.12455-40-laurent.pinchart@ideasonboard.com
parent f40f4e45

arch/arm/configs/omap2plus_defconfig

+3 −4
Original line number Diff line number Diff line
@@ -350,14 +350,13 @@ CONFIG_DRM_OMAP=m 
CONFIG_OMAP5_DSS_HDMI=y

CONFIG_OMAP2_DSS_SDI=y

CONFIG_OMAP2_DSS_DSI=y

CONFIG_DRM_OMAP_ENCODER_OPA362=m

CONFIG_DRM_OMAP_ENCODER_TPD12S015=m

CONFIG_DRM_OMAP_CONNECTOR_HDMI=m

CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m

CONFIG_DRM_OMAP_PANEL_DSI_CM=m

CONFIG_DRM_TILCDC=m

CONFIG_DRM_PANEL_SIMPLE=m

CONFIG_DRM_DISPLAY_CONNECTOR=m

CONFIG_DRM_SIMPLE_BRIDGE=m

CONFIG_DRM_TI_TFP410=m

CONFIG_DRM_TI_TPD12S015=m

CONFIG_DRM_PANEL_LG_LB035Q02=m

CONFIG_DRM_PANEL_NEC_NL8048HL11=m

CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m

drivers/gpu/drm/omapdrm/displays/Kconfig

+0 −22
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

menu "OMAPDRM External Display Device Drivers"



config DRM_OMAP_ENCODER_OPA362

	tristate "OPA362 external analog amplifier"

	help

	  Driver for OPA362 external analog TV amplifier controlled

	  through a GPIO.



config DRM_OMAP_ENCODER_TPD12S015

	tristate "TPD12S015 HDMI ESD protection and level shifter"

	help

	  Driver for TPD12S015, which offers HDMI ESD protection and level

	  shifting.



config DRM_OMAP_CONNECTOR_HDMI

	tristate "HDMI Connector"

	help

	  Driver for a generic HDMI connector.



config DRM_OMAP_CONNECTOR_ANALOG_TV

	tristate "Analog TV Connector"

	help

	  Driver for a generic analog TV connector.



config DRM_OMAP_PANEL_DSI_CM

	tristate "Generic DSI Command Mode Panel"

	depends on BACKLIGHT_CLASS_DEVICE

drivers/gpu/drm/omapdrm/displays/Makefile

+0 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_DRM_OMAP_ENCODER_OPA362) += encoder-opa362.o

obj-$(CONFIG_DRM_OMAP_ENCODER_TPD12S015) += encoder-tpd12s015.o

obj-$(CONFIG_DRM_OMAP_CONNECTOR_HDMI) += connector-hdmi.o

obj-$(CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV) += connector-analog-tv.o

obj-$(CONFIG_DRM_OMAP_PANEL_DSI_CM) += panel-dsi-cm.o

drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c

deleted100644 → 0
+0 −97
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Analog TV Connector driver

 *

 * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 */



#include <linux/slab.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/of.h>



#include "../dss/omapdss.h"



struct panel_drv_data {

	struct omap_dss_device dssdev;



	struct device *dev;

};



#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)



static int tvc_connect(struct omap_dss_device *src,

		       struct omap_dss_device *dst)

{

	return 0;

}



static void tvc_disconnect(struct omap_dss_device *src,

			   struct omap_dss_device *dst)

{

}



static const struct omap_dss_device_ops tvc_ops = {

	.connect		= tvc_connect,

	.disconnect		= tvc_disconnect,

};



static int tvc_probe(struct platform_device *pdev)

{

	struct panel_drv_data *ddata;

	struct omap_dss_device *dssdev;



	ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);

	if (!ddata)

		return -ENOMEM;



	platform_set_drvdata(pdev, ddata);

	ddata->dev = &pdev->dev;



	dssdev = &ddata->dssdev;

	dssdev->ops = &tvc_ops;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_VENC;

	dssdev->display = true;

	dssdev->owner = THIS_MODULE;

	dssdev->of_port = 0;



	omapdss_display_init(dssdev);

	omapdss_device_register(dssdev);



	return 0;

}



static int __exit tvc_remove(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);



	omapdss_device_unregister(&ddata->dssdev);



	return 0;

}



static const struct of_device_id tvc_of_match[] = {

	{ .compatible = "omapdss,svideo-connector", },

	{ .compatible = "omapdss,composite-video-connector", },

	{},

};



MODULE_DEVICE_TABLE(of, tvc_of_match);



static struct platform_driver tvc_connector_driver = {

	.probe	= tvc_probe,

	.remove	= __exit_p(tvc_remove),

	.driver	= {

		.name	= "connector-analog-tv",

		.of_match_table = tvc_of_match,

		.suppress_bind_attrs = true,

	},

};



module_platform_driver(tvc_connector_driver);



MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");

MODULE_DESCRIPTION("Analog TV Connector driver");

MODULE_LICENSE("GPL");

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

deleted100644 → 0
+0 −183
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * HDMI Connector driver

 *

 * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 */



#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/platform_device.h>

#include <linux/slab.h>



#include "../dss/omapdss.h"



struct panel_drv_data {

	struct omap_dss_device dssdev;

	void (*hpd_cb)(void *cb_data, enum drm_connector_status status);

	void *hpd_cb_data;

	struct mutex hpd_lock;



	struct device *dev;



	struct gpio_desc *hpd_gpio;

};



#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)



static int hdmic_connect(struct omap_dss_device *src,

			 struct omap_dss_device *dst)

{

	return 0;

}



static void hdmic_disconnect(struct omap_dss_device *src,

			     struct omap_dss_device *dst)

{

}



static bool hdmic_detect(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);



	return gpiod_get_value_cansleep(ddata->hpd_gpio);

}



static void hdmic_register_hpd_cb(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);

}



static void hdmic_unregister_hpd_cb(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);



	mutex_lock(&ddata->hpd_lock);

	ddata->hpd_cb = NULL;

	ddata->hpd_cb_data = NULL;

	mutex_unlock(&ddata->hpd_lock);

}



static const struct omap_dss_device_ops hdmic_ops = {

	.connect		= hdmic_connect,

	.disconnect		= hdmic_disconnect,



	.detect			= hdmic_detect,

	.register_hpd_cb	= hdmic_register_hpd_cb,

	.unregister_hpd_cb	= hdmic_unregister_hpd_cb,

};



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(struct platform_device *pdev)

{

	struct panel_drv_data *ddata;

	struct omap_dss_device *dssdev;

	struct gpio_desc *gpio;

	int r;



	ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);

	if (!ddata)

		return -ENOMEM;



	platform_set_drvdata(pdev, ddata);

	ddata->dev = &pdev->dev;



	mutex_init(&ddata->hpd_lock);



	/* HPD GPIO */

	gpio = devm_gpiod_get_optional(&pdev->dev, "hpd", GPIOD_IN);

	if (IS_ERR(gpio)) {

		dev_err(&pdev->dev, "failed to parse HPD gpio\n");

		return PTR_ERR(gpio);

	}



	ddata->hpd_gpio = gpio;



	if (ddata->hpd_gpio) {

		r = devm_request_threaded_irq(&pdev->dev,

				gpiod_to_irq(ddata->hpd_gpio),

				NULL, hdmic_hpd_isr,

				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |

				IRQF_ONESHOT,

				"hdmic hpd", ddata);

		if (r)

			return r;

	}



	dssdev = &ddata->dssdev;

	dssdev->ops = &hdmic_ops;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_HDMI;

	dssdev->display = true;

	dssdev->owner = THIS_MODULE;

	dssdev->of_port = 0;

	dssdev->ops_flags = ddata->hpd_gpio

			  ? OMAP_DSS_DEVICE_OP_DETECT | OMAP_DSS_DEVICE_OP_HPD

			  : 0;



	omapdss_display_init(dssdev);

	omapdss_device_register(dssdev);



	return 0;

}



static int __exit hdmic_remove(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);



	omapdss_device_unregister(&ddata->dssdev);



	return 0;

}



static const struct of_device_id hdmic_of_match[] = {

	{ .compatible = "omapdss,hdmi-connector", },

	{},

};



MODULE_DEVICE_TABLE(of, hdmic_of_match);



static struct platform_driver hdmi_connector_driver = {

	.probe	= hdmic_probe,

	.remove	= __exit_p(hdmic_remove),

	.driver	= {

		.name	= "connector-hdmi",

		.of_match_table = hdmic_of_match,

		.suppress_bind_attrs = true,

	},

};



module_platform_driver(hdmi_connector_driver);



MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");

MODULE_DESCRIPTION("HDMI Connector driver");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE