Commit 103cd8bc authored by Jyri Sarha's avatar Jyri Sarha
Browse files

drm/tilcdc: Add support for external tda998x encoder 



Add support for an external compontised DRM encoder. The external
encoder can be connected to tilcdc trough device tree graph binding.
The binding document for tilcdc has been updated. The current
implementation supports only tda998x encoder.

To be able to filter out the unsupported video modes the tilcdc driver
needs to hijack the external connectors helper functions. The tilcdc
installes new helper functions that are otherwise identical to
orignals, but the mode_valid() call-back check the mode first localy,
before calling the original call-back. The tilcdc dirver restores the
original helper functions before it is unbound from the external
device.

I got the idea and some lines of code from Jean-Francois Moine's
"drm/tilcdc: Change the interface with the tda998x driver"-patch.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 6730201f

Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt

+27 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ Optional properties: 
 - max-pixelclock: The maximum pixel clock that can be supported

   by the lcd controller in KHz.



Optional nodes:



 - port/ports: to describe a connection to an external encoder. The

   binding follows Documentation/devicetree/bindings/graph.txt and

   suppors a single port with a single endpoint.



Example:



	fb: fb@4830e000 {
@@ -26,4 +32,25 @@ Example: 
		interrupt-parent = <&intc>;

		interrupts = <36>;

		ti,hwmods = "lcdc";



		port {

			lcdc_0: endpoint@0 {

				remote-endpoint = <&hdmi_0>;

			};

		};

	};



	tda19988: tda19988 {

		compatible = "nxp,tda998x";

		reg = <0x70>;



		pinctrl-names = "default", "off";

		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;

		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;



		port {

			hdmi_0: endpoint@0 {

				remote-endpoint = <&lcdc_0>;

			};

		};

	};

drivers/gpu/drm/tilcdc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ tilcdc-y := \ 
	tilcdc_crtc.o \

	tilcdc_tfp410.o \

	tilcdc_panel.o \

	tilcdc_external.o \

	tilcdc_drv.o



obj-$(CONFIG_DRM_TILCDC)	+= tilcdc.o

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

+33 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ struct tilcdc_crtc { 


	/* for deferred fb unref's: */

	struct drm_flip_work unref_work;



	/* Only set if an external encoder is connected */

	bool simulate_vesa_sync;

};

#define to_tilcdc_crtc(x) container_of(x, struct tilcdc_crtc, base)
@@ -214,6 +217,28 @@ static bool tilcdc_crtc_mode_fixup(struct drm_crtc *crtc, 
		const struct drm_display_mode *mode,

		struct drm_display_mode *adjusted_mode)

{

	struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);



	if (!tilcdc_crtc->simulate_vesa_sync)

		return true;



	/*

	 * tilcdc does not generate VESA-compliant sync but aligns

	 * VS on the second edge of HS instead of first edge.

	 * We use adjusted_mode, to fixup sync by aligning both rising

	 * edges and add HSKEW offset to fix the sync.

	 */

	adjusted_mode->hskew = mode->hsync_end - mode->hsync_start;

	adjusted_mode->flags |= DRM_MODE_FLAG_HSKEW;



	if (mode->flags & DRM_MODE_FLAG_NHSYNC) {

		adjusted_mode->flags |= DRM_MODE_FLAG_PHSYNC;

		adjusted_mode->flags &= ~DRM_MODE_FLAG_NHSYNC;

	} else {

		adjusted_mode->flags |= DRM_MODE_FLAG_NHSYNC;

		adjusted_mode->flags &= ~DRM_MODE_FLAG_PHSYNC;

	}



	return true;

}
@@ -534,6 +559,14 @@ void tilcdc_crtc_set_panel_info(struct drm_crtc *crtc, 
	tilcdc_crtc->info = info;

}



void tilcdc_crtc_set_simulate_vesa_sync(struct drm_crtc *crtc,

					bool simulate_vesa_sync)

{

	struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);



	tilcdc_crtc->simulate_vesa_sync = simulate_vesa_sync;

}



void tilcdc_crtc_update_clk(struct drm_crtc *crtc)

{

	struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);

drivers/gpu/drm/tilcdc/tilcdc_drv.c

+72 −13
Original line number Diff line number Diff line
@@ -17,10 +17,13 @@ 


/* LCDC DRM driver, based on da8xx-fb */



#include <linux/component.h>



#include "tilcdc_drv.h"

#include "tilcdc_regs.h"

#include "tilcdc_tfp410.h"

#include "tilcdc_panel.h"

#include "tilcdc_external.h"



#include "drm_fb_helper.h"
@@ -73,13 +76,6 @@ static int modeset_init(struct drm_device *dev) 
		mod->funcs->modeset_init(mod, dev);

	}



	if ((priv->num_encoders == 0) || (priv->num_connectors == 0)) {

		/* oh nos! */

		dev_err(dev->dev, "no encoders/connectors found\n");

		drm_mode_config_cleanup(dev);

		return -ENXIO;

	}



	dev->mode_config.min_width = 0;

	dev->mode_config.min_height = 0;

	dev->mode_config.max_width = tilcdc_crtc_max_width(priv->crtc);
@@ -114,6 +110,8 @@ static int tilcdc_unload(struct drm_device *dev) 
{

	struct tilcdc_drm_private *priv = dev->dev_private;



	tilcdc_remove_external_encoders(dev);



	drm_fbdev_cma_fini(priv->fbdev);

	drm_kms_helper_poll_fini(dev);

	drm_mode_config_cleanup(dev);
@@ -164,6 +162,9 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags) 


	dev->dev_private = priv;



	priv->is_componentized =

		tilcdc_get_external_components(dev->dev, NULL) > 0;



	priv->wq = alloc_ordered_workqueue("tilcdc", 0);

	if (!priv->wq) {

		ret = -ENOMEM;
@@ -253,10 +254,28 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags) 
		goto fail_cpufreq_unregister;

	}



	platform_set_drvdata(pdev, dev);



	if (priv->is_componentized) {

		ret = component_bind_all(dev->dev, dev);

		if (ret < 0)

			goto fail_mode_config_cleanup;



		ret = tilcdc_add_external_encoders(dev, &bpp);

		if (ret < 0)

			goto fail_component_cleanup;

	}



	if ((priv->num_encoders == 0) || (priv->num_connectors == 0)) {

		dev_err(dev->dev, "no encoders/connectors found\n");

		ret = -ENXIO;

		goto fail_external_cleanup;

	}



	ret = drm_vblank_init(dev, 1);

	if (ret < 0) {

		dev_err(dev->dev, "failed to initialize vblank\n");

		goto fail_mode_config_cleanup;

		goto fail_external_cleanup;

	}



	pm_runtime_get_sync(dev->dev);
@@ -267,9 +286,6 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags) 
		goto fail_vblank_cleanup;

	}



	platform_set_drvdata(pdev, dev);





	list_for_each_entry(mod, &module_list, list) {

		DBG("%s: preferred_bpp: %d", mod->name, mod->preferred_bpp);

		bpp = mod->preferred_bpp;
@@ -300,6 +316,13 @@ fail_vblank_cleanup: 
fail_mode_config_cleanup:

	drm_mode_config_cleanup(dev);



fail_component_cleanup:

	if (priv->is_componentized)

		component_unbind_all(dev->dev, dev);



fail_external_cleanup:

	tilcdc_remove_external_encoders(dev);



fail_cpufreq_unregister:

	pm_runtime_disable(dev->dev);

#ifdef CONFIG_CPU_FREQ
@@ -605,19 +628,55 @@ static const struct dev_pm_ops tilcdc_pm_ops = { 
 * Platform driver:

 */



static int tilcdc_bind(struct device *dev)

{

	return drm_platform_init(&tilcdc_driver, to_platform_device(dev));

}



static void tilcdc_unbind(struct device *dev)

{

	drm_put_dev(dev_get_drvdata(dev));

}



static const struct component_master_ops tilcdc_comp_ops = {

	.bind = tilcdc_bind,

	.unbind = tilcdc_unbind,

};



static int tilcdc_pdev_probe(struct platform_device *pdev)

{

	struct component_match *match = NULL;

	int ret;



	/* bail out early if no DT data: */

	if (!pdev->dev.of_node) {

		dev_err(&pdev->dev, "device-tree data is missing\n");

		return -ENXIO;

	}



	ret = tilcdc_get_external_components(&pdev->dev, &match);

	if (ret < 0)

		return ret;

	else if (ret == 0)

		return drm_platform_init(&tilcdc_driver, pdev);

	else

		return component_master_add_with_match(&pdev->dev,

						       &tilcdc_comp_ops,

						       match);

}



static int tilcdc_pdev_remove(struct platform_device *pdev)

{

	struct drm_device *ddev = dev_get_drvdata(&pdev->dev);

	struct tilcdc_drm_private *priv = ddev->dev_private;



	/* Check if a subcomponent has already triggered the unloading. */

	if (!priv)

		return 0;



	if (priv->is_componentized)

		component_master_del(&pdev->dev, &tilcdc_comp_ops);

	else

		drm_put_dev(platform_get_drvdata(pdev));



	return 0;

drivers/gpu/drm/tilcdc/tilcdc_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ struct tilcdc_drm_private { 


	unsigned int num_connectors;

	struct drm_connector *connectors[8];

	const struct drm_connector_helper_funcs *connector_funcs[8];



	bool is_componentized;

};



/* Sub-module for display.  Since we don't know at compile time what panels
@@ -165,6 +168,8 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc); 
void tilcdc_crtc_update_clk(struct drm_crtc *crtc);

void tilcdc_crtc_set_panel_info(struct drm_crtc *crtc,

		const struct tilcdc_panel_info *info);

void tilcdc_crtc_set_simulate_vesa_sync(struct drm_crtc *crtc,

					bool simulate_vesa_sync);

int tilcdc_crtc_mode_valid(struct drm_crtc *crtc, struct drm_display_mode *mode);

int tilcdc_crtc_max_width(struct drm_crtc *crtc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE