diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2015-07-01 13:14:57 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 13:50:23 +0900 |
| commit | e28b7fdb96800903d74e0504704d38d2062e95ff (patch) | |
| tree | 6a1d8418b35947823a4fab5d9109c6c6119157ec | |
| parent | c79c9d3ebd542779d4dae2bd6ead3323411aad2d (diff) | |
drm/exynos: fix vsync interrupt clear rountine of mixer
INT_EN_VSYNC bit is not used when we clear vsync interrupt but
INT_STATUS_VSYNC bit should be related.
Also, if we want to enable vsync interrupt, we should write 1 in
INT_CLEAR_VSYNC bit before we set INT_EN_VSYNC bit. It will clear prior
vsync interrupt. You can check it from exynos mixer user manual.
Change-Id: Ide955d5cb966e49883c51d8fab0eba51897bac7a
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 368b1698e0bd..b125d020eec5 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -765,15 +765,14 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg) atomic_set(&ctx->wait_vsync_event, 0); wake_up(&ctx->wait_vsync_queue); } - } out: - /* clear interrupts */ - if (~val & MXR_INT_EN_VSYNC) { /* vsync interrupt use different bit for read and clear */ - val &= ~MXR_INT_EN_VSYNC; + val &= ~MXR_INT_STATUS_VSYNC; val |= MXR_INT_CLEAR_VSYNC; } + + /* clear interrupts */ mixer_reg_write(res, MXR_INT_STATUS, val); spin_unlock(&res->reg_slock); @@ -931,6 +930,7 @@ static int mixer_enable_vblank(struct exynos_drm_crtc *crtc) } /* enable vsync interrupt */ + mixer_reg_write(res, MXR_INT_STATUS, MXR_INT_CLEAR_VSYNC); mixer_reg_writemask(res, MXR_INT_EN, MXR_INT_EN_VSYNC, MXR_INT_EN_VSYNC); |