diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 22:17:10 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 22:17:10 +0100 |
commit | a9037430c6c784165a940a90bcd29f886834c8e7 (patch) | |
tree | 4b186e0a761e93a6c6712053d444b566c0d25338 /drivers/gpu/drm/exynos/exynos_mixer.c | |
parent | 6125bc8b86d9da75ddac77e38f41afbf9f5de3e3 (diff) | |
parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
download | linux-a9037430c6c784165a940a90bcd29f886834c8e7.tar.bz2 |
Merge branch 'timers/for-arm' into timers/core
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_mixer.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index c187ea33b748..c414584bfbae 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -600,7 +600,7 @@ static void vp_win_reset(struct mixer_context *ctx) /* waiting until VP_SRESET_PROCESSING is 0 */ if (~vp_reg_read(res, VP_SRESET) & VP_SRESET_PROCESSING) break; - mdelay(10); + usleep_range(10000, 12000); } WARN(tries == 0, "failed to reset Video Processor\n"); } @@ -776,6 +776,13 @@ static void mixer_win_commit(void *ctx, int win) DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win); + mutex_lock(&mixer_ctx->mixer_mutex); + if (!mixer_ctx->powered) { + mutex_unlock(&mixer_ctx->mixer_mutex); + return; + } + mutex_unlock(&mixer_ctx->mixer_mutex); + if (win > 1 && mixer_ctx->vp_enabled) vp_video_buffer(mixer_ctx, win); else |