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

Commit 78230c46 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next 

omapdrm patches for v4.17

* Fix sparse warnings from omapdrm
* HPD support for DVI connector
* Big cleanup to remove static variables

* tag 'omapdrm-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (69 commits)
  drm/omap: fix compile error when DPI is disabled
  drm/omap: fix compile error when debugfs is disabled
  drm: omapdrm: displays: panel-dsi-cm: Fix field access before set
  drm/omap: cleanup color space conversion
  drm/omap: Allow HDMI audio setup even if we do not have video configured
  drm/omap: fix maximum sizes
  drm/omap: add writeback funcs to dispc_ops
  drm/omap: fix scaling limits for WB
  drm/omap: fix WB height with interlace
  drm/omap: fix WBDELAYCOUNT with interlace
  drm/omap: fix WBDELAYCOUNT for HDMI
  drm/omap: set WB channel-in in wb_setup()
  drm/omap: Add pclk setting case when channel is DSS_WB
  drm/omap: dispc: disp_wb_setup to check return code
  drm/omap: remove leftover enums
  dt-bindings: display: add HPD gpio to DVI connector
  drm/omap: add HPD support to connector-dvi
  drm/omap: Init fbdev emulation only when we have displays
  drm/omap: cleanup fbdev init/free
  drm/omap: fix omap_fbdev_free() when omap_fbdev_create() wasn't called
  ...
parents b65bd403 037f0315

Documentation/devicetree/bindings/display/connector/dvi-connector.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Optional properties: 
- analog: the connector has DVI analog pins

- digital: the connector has DVI digital pins

- dual-link: the connector has pins for DVI dual-link

- hpd-gpios: HPD GPIO number



Required nodes:

- Video port for DVI input

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

+15 −35
Original line number Diff line number Diff line
@@ -40,14 +40,12 @@ static const struct videomode tvc_pal_vm = { 
			  DISPLAY_FLAGS_VSYNC_LOW,

};



static const struct of_device_id tvc_of_match[];



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



static int tvc_connect(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in;

	int r;



	dev_dbg(ddata->dev, "connect\n");
@@ -55,10 +53,19 @@ static int tvc_connect(struct omap_dss_device *dssdev) 
	if (omapdss_device_is_connected(dssdev))

		return 0;



	in = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);

	if (IS_ERR(in)) {

		dev_err(ddata->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	r = in->ops.atv->connect(in, dssdev);

	if (r)

	if (r) {

		omap_dss_put_device(in);

		return r;

	}



	ddata->in = in;

	return 0;

}
@@ -73,6 +80,9 @@ static void tvc_disconnect(struct omap_dss_device *dssdev) 
		return;



	in->ops.atv->disconnect(in, dssdev);



	omap_dss_put_device(in);

	ddata->in = NULL;

}



static int tvc_enable(struct omap_dss_device *dssdev)
@@ -175,32 +185,12 @@ static struct omap_dss_driver tvc_driver = { 
	.set_wss		= tvc_set_wss,

};



static int tvc_probe_of(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct device_node *node = pdev->dev.of_node;

	struct omap_dss_device *in;



	in = omapdss_of_find_source_for_first_ep(node);

	if (IS_ERR(in)) {

		dev_err(&pdev->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	ddata->in = in;



	return 0;

}



static int tvc_probe(struct platform_device *pdev)

{

	struct panel_drv_data *ddata;

	struct omap_dss_device *dssdev;

	int r;



	if (!pdev->dev.of_node)

		return -ENODEV;



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

	if (!ddata)

		return -ENOMEM;
@@ -208,10 +198,6 @@ static int tvc_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ddata);

	ddata->dev = &pdev->dev;



	r = tvc_probe_of(pdev);

	if (r)

		return r;



	ddata->vm = tvc_pal_vm;



	dssdev = &ddata->dssdev;
@@ -224,28 +210,22 @@ static int tvc_probe(struct platform_device *pdev) 
	r = omapdss_register_display(dssdev);

	if (r) {

		dev_err(&pdev->dev, "Failed to register panel\n");

		goto err_reg;

		return r;

	}



	return 0;

err_reg:

	omap_dss_put_device(ddata->in);

	return r;

}



static int __exit tvc_remove(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct omap_dss_device *dssdev = &ddata->dssdev;

	struct omap_dss_device *in = ddata->in;



	omapdss_unregister_display(&ddata->dssdev);



	tvc_disable(dssdev);

	tvc_disconnect(dssdev);



	omap_dss_put_device(in);



	return 0;

}

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

+129 −17
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * the Free Software Foundation.

 */



#include <linux/gpio/consumer.h>

#include <linux/i2c.h>

#include <linux/module.h>

#include <linux/platform_device.h>
@@ -44,6 +45,14 @@ struct panel_drv_data { 
	struct videomode vm;



	struct i2c_adapter *i2c_adapter;



	struct gpio_desc *hpd_gpio;



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

	void *hpd_cb_data;

	bool hpd_enabled;

	/* mutex for hpd fields above */

	struct mutex hpd_lock;

};



#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -51,16 +60,25 @@ struct panel_drv_data { 
static int dvic_connect(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in;

	int r;



	if (omapdss_device_is_connected(dssdev))

		return 0;



	in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);

	if (IS_ERR(in)) {

		dev_err(dssdev->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	r = in->ops.dvi->connect(in, dssdev);

	if (r)

	if (r) {

		omap_dss_put_device(in);

		return r;

	}



	ddata->in = in;

	return 0;

}
@@ -73,6 +91,9 @@ static void dvic_disconnect(struct omap_dss_device *dssdev) 
		return;



	in->ops.dvi->disconnect(in, dssdev);



	omap_dss_put_device(in);

	ddata->in = NULL;

}



static int dvic_enable(struct omap_dss_device *dssdev)
@@ -177,6 +198,9 @@ static int dvic_read_edid(struct omap_dss_device *dssdev, 
	struct panel_drv_data *ddata = to_panel_data(dssdev);

	int r, l, bytes_read;



	if (ddata->hpd_gpio && !gpiod_get_value_cansleep(ddata->hpd_gpio))

		return -ENODEV;



	if (!ddata->i2c_adapter)

		return -ENODEV;
@@ -208,6 +232,9 @@ static bool dvic_detect(struct omap_dss_device *dssdev) 
	unsigned char out;

	int r;



	if (ddata->hpd_gpio)

		return gpiod_get_value_cansleep(ddata->hpd_gpio);



	if (!ddata->i2c_adapter)

		return true;
@@ -216,6 +243,60 @@ static bool dvic_detect(struct omap_dss_device *dssdev) 
	return r == 0;

}



static int dvic_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);



	if (!ddata->hpd_gpio)

		return -ENOTSUPP;



	mutex_lock(&ddata->hpd_lock);

	ddata->hpd_cb = cb;

	ddata->hpd_cb_data = cb_data;

	mutex_unlock(&ddata->hpd_lock);

	return 0;

}



static void dvic_unregister_hpd_cb(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);



	if (!ddata->hpd_gpio)

		return;



	mutex_lock(&ddata->hpd_lock);

	ddata->hpd_cb = NULL;

	ddata->hpd_cb_data = NULL;

	mutex_unlock(&ddata->hpd_lock);

}



static void dvic_enable_hpd(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);



	if (!ddata->hpd_gpio)

		return;



	mutex_lock(&ddata->hpd_lock);

	ddata->hpd_enabled = true;

	mutex_unlock(&ddata->hpd_lock);

}



static void dvic_disable_hpd(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);



	if (!ddata->hpd_gpio)

		return;



	mutex_lock(&ddata->hpd_lock);

	ddata->hpd_enabled = false;

	mutex_unlock(&ddata->hpd_lock);

}



static struct omap_dss_driver dvic_driver = {

	.connect	= dvic_connect,

	.disconnect	= dvic_disconnect,
@@ -229,23 +310,60 @@ static struct omap_dss_driver dvic_driver = { 


	.read_edid	= dvic_read_edid,

	.detect		= dvic_detect,



	.register_hpd_cb	= dvic_register_hpd_cb,

	.unregister_hpd_cb	= dvic_unregister_hpd_cb,

	.enable_hpd		= dvic_enable_hpd,

	.disable_hpd		= dvic_disable_hpd,

};



static irqreturn_t dvic_hpd_isr(int irq, void *data)

{

	struct panel_drv_data *ddata = data;



	mutex_lock(&ddata->hpd_lock);

	if (ddata->hpd_enabled && ddata->hpd_cb) {

		enum drm_connector_status status;



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

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct device_node *node = pdev->dev.of_node;

	struct omap_dss_device *in;

	struct device_node *adapter_node;

	struct i2c_adapter *adapter;

	struct gpio_desc *gpio;

	int r;



	in = omapdss_of_find_source_for_first_ep(node);

	if (IS_ERR(in)) {

		dev_err(&pdev->dev, "failed to find video source\n");

		return PTR_ERR(in);

	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->in = in;

	ddata->hpd_gpio = gpio;



	mutex_init(&ddata->hpd_lock);



	if (ddata->hpd_gpio) {

		r = devm_request_threaded_irq(&pdev->dev,

			gpiod_to_irq(ddata->hpd_gpio), NULL, dvic_hpd_isr,

			IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

			"DVI HPD", ddata);

		if (r)

			return r;

	}



	adapter_node = of_parse_phandle(node, "ddc-i2c-bus", 0);

	if (adapter_node) {
@@ -253,7 +371,6 @@ static int dvic_probe_of(struct platform_device *pdev) 
		of_node_put(adapter_node);

		if (adapter == NULL) {

			dev_err(&pdev->dev, "failed to parse ddc-i2c-bus\n");

			omap_dss_put_device(ddata->in);

			return -EPROBE_DEFER;

		}
@@ -275,9 +392,6 @@ static int dvic_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, ddata);



	if (!pdev->dev.of_node)

		return -ENODEV;



	r = dvic_probe_of(pdev);

	if (r)

		return r;
@@ -300,9 +414,8 @@ static int dvic_probe(struct platform_device *pdev) 
	return 0;



err_reg:

	omap_dss_put_device(ddata->in);



	i2c_put_adapter(ddata->i2c_adapter);

	mutex_destroy(&ddata->hpd_lock);



	return r;

}
@@ -311,17 +424,16 @@ static int __exit dvic_remove(struct platform_device *pdev) 
{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct omap_dss_device *dssdev = &ddata->dssdev;

	struct omap_dss_device *in = ddata->in;



	omapdss_unregister_display(&ddata->dssdev);



	dvic_disable(dssdev);

	dvic_disconnect(dssdev);



	omap_dss_put_device(in);



	i2c_put_adapter(ddata->i2c_adapter);



	mutex_destroy(&ddata->hpd_lock);



	return 0;

}

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

+17 −23
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct panel_drv_data { 
static int hdmic_connect(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in;

	int r;



	dev_dbg(ddata->dev, "connect\n");
@@ -63,10 +63,19 @@ static int hdmic_connect(struct omap_dss_device *dssdev) 
	if (omapdss_device_is_connected(dssdev))

		return 0;



	in = omapdss_of_find_source_for_first_ep(ddata->dev->of_node);

	if (IS_ERR(in)) {

		dev_err(ddata->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	r = in->ops.hdmi->connect(in, dssdev);

	if (r)

	if (r) {

		omap_dss_put_device(in);

		return r;

	}



	ddata->in = in;

	return 0;

}
@@ -81,6 +90,9 @@ static void hdmic_disconnect(struct omap_dss_device *dssdev) 
		return;



	in->ops.hdmi->disconnect(in, dssdev);



	omap_dss_put_device(in);

	ddata->in = NULL;

}



static int hdmic_enable(struct omap_dss_device *dssdev)
@@ -302,7 +314,6 @@ static int hdmic_probe_of(struct platform_device *pdev) 
{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct device_node *node = pdev->dev.of_node;

	struct omap_dss_device *in;

	int gpio;



	/* HPD GPIO */
@@ -312,14 +323,6 @@ static int hdmic_probe_of(struct platform_device *pdev) 
	else

		ddata->hpd_gpio = -ENODEV;



	in = omapdss_of_find_source_for_first_ep(node);

	if (IS_ERR(in)) {

		dev_err(&pdev->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	ddata->in = in;



	return 0;

}
@@ -336,9 +339,6 @@ static int hdmic_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ddata);

	ddata->dev = &pdev->dev;



	if (!pdev->dev.of_node)

		return -ENODEV;



	r = hdmic_probe_of(pdev);

	if (r)

		return r;
@@ -349,7 +349,7 @@ static int hdmic_probe(struct platform_device *pdev) 
		r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio,

				GPIOF_DIR_IN, "hdmi_hpd");

		if (r)

			goto err_reg;

			return r;



		r = devm_request_threaded_irq(&pdev->dev,

				gpio_to_irq(ddata->hpd_gpio),
@@ -358,7 +358,7 @@ static int hdmic_probe(struct platform_device *pdev) 
				IRQF_ONESHOT,

				"hdmic hpd", ddata);

		if (r)

			goto err_reg;

			return r;

	}



	ddata->vm = hdmic_default_vm;
@@ -373,28 +373,22 @@ static int hdmic_probe(struct platform_device *pdev) 
	r = omapdss_register_display(dssdev);

	if (r) {

		dev_err(&pdev->dev, "Failed to register panel\n");

		goto err_reg;

		return r;

	}



	return 0;

err_reg:

	omap_dss_put_device(ddata->in);

	return r;

}



static int __exit hdmic_remove(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct omap_dss_device *dssdev = &ddata->dssdev;

	struct omap_dss_device *in = ddata->in;



	omapdss_unregister_display(&ddata->dssdev);



	hdmic_disable(dssdev);

	hdmic_disconnect(dssdev);



	omap_dss_put_device(in);



	return 0;

}

drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

+16 −24
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int opa362_connect(struct omap_dss_device *dssdev, 
		struct omap_dss_device *dst)

{

	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;

	struct omap_dss_device *in;

	int r;



	dev_dbg(dssdev->dev, "connect\n");
@@ -44,13 +44,22 @@ static int opa362_connect(struct omap_dss_device *dssdev, 
	if (omapdss_device_is_connected(dssdev))

		return -EBUSY;



	in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);

	if (IS_ERR(in)) {

		dev_err(dssdev->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	r = in->ops.atv->connect(in, dssdev);

	if (r)

	if (r) {

		omap_dss_put_device(in);

		return r;

	}



	dst->src = dssdev;

	dssdev->dst = dst;



	ddata->in = in;

	return 0;

}
@@ -74,6 +83,9 @@ static void opa362_disconnect(struct omap_dss_device *dssdev, 
	dssdev->dst = NULL;



	in->ops.atv->disconnect(in, &ddata->dssdev);



	omap_dss_put_device(in);

	ddata->in = NULL;

}



static int opa362_enable(struct omap_dss_device *dssdev)
@@ -171,19 +183,13 @@ static const struct omapdss_atv_ops opa362_atv_ops = { 


static int opa362_probe(struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;

	struct panel_drv_data *ddata;

	struct omap_dss_device *dssdev, *in;

	struct omap_dss_device *dssdev;

	struct gpio_desc *gpio;

	int r;



	dev_dbg(&pdev->dev, "probe\n");



	if (node == NULL) {

		dev_err(&pdev->dev, "Unable to find device tree\n");

		return -EINVAL;

	}



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

	if (!ddata)

		return -ENOMEM;
@@ -196,14 +202,6 @@ static int opa362_probe(struct platform_device *pdev) 


	ddata->enable_gpio = gpio;



	in = omapdss_of_find_source_for_first_ep(node);

	if (IS_ERR(in)) {

		dev_err(&pdev->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	ddata->in = in;



	dssdev = &ddata->dssdev;

	dssdev->ops.atv = &opa362_atv_ops;

	dssdev->dev = &pdev->dev;
@@ -214,20 +212,16 @@ static int opa362_probe(struct platform_device *pdev) 
	r = omapdss_register_output(dssdev);

	if (r) {

		dev_err(&pdev->dev, "Failed to register output\n");

		goto err_reg;

		return r;

	}



	return 0;

err_reg:

	omap_dss_put_device(ddata->in);

	return r;

}



static int __exit opa362_remove(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct omap_dss_device *dssdev = &ddata->dssdev;

	struct omap_dss_device *in = ddata->in;



	omapdss_unregister_output(&ddata->dssdev);
@@ -239,8 +233,6 @@ static int __exit opa362_remove(struct platform_device *pdev) 
	if (omapdss_device_is_connected(dssdev))

		opa362_disconnect(dssdev, dssdev->dst);



	omap_dss_put_device(in);



	return 0;

}