From 05e572794f725c2dc819ec7cfa971f182637940e Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Thu, 21 Feb 2013 13:18:03 -0500 Subject: [PATCH] drm/exynos: Don't win_disable if mixer is off The win_disable function shouldn't be called when the mixer is off. This also prevents us from waiting for a vsync that will never happen (occurs twice on boot, adding 2 seconds to the boot time). BUG=None TEST=Tested on snow, verified no regressions Change-Id: I59e0df06336bbd28440cddf814b233e0027637c2 Signed-off-by: Sean Paul Reviewed-on: https://gerrit.chromium.org/gerrit/43724 --- drivers/gpu/drm/exynos/exynos_mixer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 4d68b41532d2..607b16e63e23 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -877,6 +877,9 @@ static void mixer_win_disable(void *ctx, int zpos) return; } + if (!mctx->is_mixer_powered_on) + return; + mixer_wait_for_vsync(mctx); spin_lock_irqsave(&res->reg_slock, flags); -- 2.20.1