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

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

drm/omap: Merge omap_dss_device type and output_type fields 



The omap_dss_device type and output_type fields differ mostly for
historical reasons. The output_type field is required for all devices
but the display at the end of the pipeline, and must be set to
OMAP_DISPLAY_TYPE_NONE for the latter. The type field is required for
all devices but the internal encoder, for which it is ignored.

The only reason why the output_type field must be set to
OMAP_DISPLAY_TYPE_NONE for the display at the end of the pipeline is to
identify omap_dss_device instances corresponding to displays. This is
not documented and confusing.

Clean the code by adding a new display field to the omap_dss_device
structure to identify displays, and merge the type and output_type
fields.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent a4e26525

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

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static int tvc_probe(struct platform_device *pdev) 
	dssdev->ops = &tvc_ops;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_VENC;

	dssdev->display = true;

	dssdev->owner = THIS_MODULE;

	dssdev->of_ports = BIT(0);

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

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ static int dvic_probe(struct platform_device *pdev) 
	dssdev->ops = &dvic_ops;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_DVI;

	dssdev->display = true;

	dssdev->owner = THIS_MODULE;

	dssdev->of_ports = BIT(0);

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

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ static int hdmic_probe(struct platform_device *pdev) 
	dssdev->ops = &hdmic_ops;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_HDMI;

	dssdev->display = true;

	dssdev->owner = THIS_MODULE;

	dssdev->of_ports = BIT(0);

	dssdev->ops_flags = ddata->hpd_gpio

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

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static int opa362_probe(struct platform_device *pdev) 
	dssdev->ops = &opa362_ops;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_VENC;

	dssdev->output_type = OMAP_DISPLAY_TYPE_VENC;

	dssdev->owner = THIS_MODULE;

	dssdev->of_ports = BIT(1) | BIT(0);

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

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ static int tfp410_probe(struct platform_device *pdev) 
	dssdev->ops = &tfp410_ops;

	dssdev->dev = &pdev->dev;

	dssdev->type = OMAP_DISPLAY_TYPE_DPI;

	dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;

	dssdev->owner = THIS_MODULE;

	dssdev->of_ports = BIT(1) | BIT(0);

	dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE