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

Commit bcb226a9 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: explicitely initialize dssdev->channel for new displays 



HDMI and VENC outputs always use the DIGIT output from DISPC. The dssdev
struct contains "channel" field which is used to specify the DISPC
output for the display, but this was not used for HDMI and VENC.

This patch fills the channel field explicitely for HDMI and VENC
displays so that we can always rely on the channel field.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 1521653c

drivers/video/omap2/dss/hdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -946,6 +946,8 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev) 
	hdmi.ls_oe_gpio = priv->ls_oe_gpio;

	hdmi.hpd_gpio = priv->hpd_gpio;



	dssdev->channel = OMAP_DSS_CHANNEL_DIGIT;



	r = hdmi_init_display(dssdev);

	if (r) {

		DSSERR("device %s init failed: %d\n", dssdev->name, r);

drivers/video/omap2/dss/venc.c

+2 −0
Original line number Diff line number Diff line
@@ -773,6 +773,8 @@ static void __init venc_probe_pdata(struct platform_device *pdev) 
	if (!dssdev)

		return;



	dssdev->channel = OMAP_DSS_CHANNEL_DIGIT;



	r = venc_init_display(dssdev);

	if (r) {

		DSSERR("device %s init failed: %d\n", dssdev->name, r);