diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-10 16:18:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-11 15:30:33 -0700 |
| commit | fb822a395f6deabd9a87838a4e3da4b87c801876 (patch) | |
| tree | c38dc43c55ca0c4cbcc3cdeaadfcec208ee9d781 /drivers/staging/imx-drm/ipuv3-crtc.c | |
| parent | 0b186416c943eebfad070d38768cc3f2a80d5443 (diff) | |
| download | op-kernel-dev-fb822a395f6deabd9a87838a4e3da4b87c801876.zip op-kernel-dev-fb822a395f6deabd9a87838a4e3da4b87c801876.tar.gz | |
staging: drm/imx: make waiting for idle channel optional
Currently we wait for a channel until it's idle before actually
disabling it. This is not needed for all channels though, so make
waiting for idle a separate function and call it where necessary.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm/ipuv3-crtc.c')
| -rw-r--r-- | drivers/staging/imx-drm/ipuv3-crtc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c index 6fd37a7..574633b 100644 --- a/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/drivers/staging/imx-drm/ipuv3-crtc.c @@ -102,6 +102,7 @@ static void ipu_fb_disable(struct ipu_crtc *ipu_crtc) if (ipu_crtc->dp) ipu_dp_disable_channel(ipu_crtc->dp); ipu_dc_disable_channel(ipu_crtc->dc); + ipu_idmac_wait_busy(ipu_crtc->ipu_ch, 50); ipu_idmac_disable_channel(ipu_crtc->ipu_ch); ipu_dmfc_disable_channel(ipu_crtc->dmfc); ipu_di_disable(ipu_crtc->di); |
