Skip to content

Commit

Permalink
omapdrm: encoder-tpd12s015: keep ls_oe_gpio high
Browse files Browse the repository at this point in the history
For OMAP4 CEC support the CEC pin should always be on. So keep
ls_oe_gpio high all the time in order to support CEC.

Background: even if the HPD is low it should still be possible
to use CEC. Some displays will set the HPD low when they go into standby or
when they switch to another input, but CEC is still available and able
to wake up/change input for such a display.

This is explicitly allowed by the CEC standard.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Hans Verkuil authored and Tomi Valkeinen committed Oct 12, 2017
1 parent 9e66317 commit 3b86b9e
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ static int tpd_connect(struct omap_dss_device *dssdev,
dssdev->dst = dst;

gpiod_set_value_cansleep(ddata->ct_cp_hpd_gpio, 1);
gpiod_set_value_cansleep(ddata->ls_oe_gpio, 1);

/* DC-DC converter needs at max 300us to get to 90% of 5V */
udelay(300);

Expand All @@ -69,6 +71,7 @@ static void tpd_disconnect(struct omap_dss_device *dssdev,
return;

gpiod_set_value_cansleep(ddata->ct_cp_hpd_gpio, 0);
gpiod_set_value_cansleep(ddata->ls_oe_gpio, 0);

dst->src = NULL;
dssdev->dst = NULL;
Expand Down Expand Up @@ -146,18 +149,11 @@ static int tpd_read_edid(struct omap_dss_device *dssdev,
{
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
int r;

if (!gpiod_get_value_cansleep(ddata->hpd_gpio))
return -ENODEV;

gpiod_set_value_cansleep(ddata->ls_oe_gpio, 1);

r = in->ops.hdmi->read_edid(in, edid, len);

gpiod_set_value_cansleep(ddata->ls_oe_gpio, 0);

return r;
return in->ops.hdmi->read_edid(in, edid, len);
}

static bool tpd_detect(struct omap_dss_device *dssdev)
Expand Down

0 comments on commit 3b86b9e

Please sign in to comment.