Skip to content

Commit

Permalink
OMAPDSS: explicitely initialize dssdev->channel for new displays
Browse files Browse the repository at this point in the history
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Sep 18, 2012
1 parent 1521653 commit bcb226a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/video/omap2/dss/hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bcb226a

Please sign in to comment.