diff options
| author | Arve Hjønnevåg <arve@android.com> | 2011-07-26 18:40:54 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-07-26 18:55:18 -0700 |
| commit | 5bbc925b36858142a91f64a7782a2208577d519f (patch) | |
| tree | afef1b8f42a772cf51697ca55de1736223fc03e8 /drivers/video/omap2/dss | |
| parent | 0af462f8b6ba1c5e8b5d684e4c1679349bec22fd (diff) | |
| download | kernel_samsung_tuna-5bbc925b36858142a91f64a7782a2208577d519f.zip kernel_samsung_tuna-5bbc925b36858142a91f64a7782a2208577d519f.tar.gz kernel_samsung_tuna-5bbc925b36858142a91f64a7782a2208577d519f.tar.bz2 | |
Revert "OMAP4: DSS: Fix CIO errors with interleaved commands"
This reverts commit 0af462f8b6ba1c5e8b5d684e4c1679349bec22fd.
That commit breaks dsi_vc_dcs_read in video mode. It also does not
seem good for dsi_vc_dcs_write since it makes that function an alias
for dsi_vc_dcs_write_nosync. Without the response the call does not
block until the data has been received on the other end, which
can cause problems with init sequences that require delays
between commands, and it cannot report errors that are part of
the response.
Change-Id: Id0c32e675b3c2f834575b4b23f296ede5da0bee9
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'drivers/video/omap2/dss')
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 34d891a..6975645 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -3192,11 +3192,9 @@ int dsi_vc_dcs_write(struct omap_dss_device *dssdev, int channel, u8 *data, if (r) goto err; - if (dssdev->phy.dsi.type != OMAP_DSS_DSI_TYPE_VIDEO_MODE) { - r = dsi_vc_send_bta_sync(dssdev, channel); - if (r) - goto err; - } + r = dsi_vc_send_bta_sync(dssdev, channel); + if (r) + goto err; /* RX_FIFO_NOT_EMPTY */ if (REG_GET(dsidev, DSI_VC_CTRL(channel), 20, 20)) { @@ -3246,11 +3244,9 @@ int dsi_vc_dcs_read(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd, if (r) goto err; - if (dssdev->phy.dsi.type != OMAP_DSS_DSI_TYPE_VIDEO_MODE) { - r = dsi_vc_send_bta_sync(dssdev, channel); - if (r) - goto err; - } + r = dsi_vc_send_bta_sync(dssdev, channel); + if (r) + goto err; /* RX_FIFO_NOT_EMPTY */ if (REG_GET(dsidev, DSI_VC_CTRL(channel), 20, 20) == 0) { |