diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-08 09:49:43 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-08 09:49:43 (GMT) |
| commit | 56d94d70398f0fbb1863a03a145db1a86f009a71 (patch) | |
| tree | 9e52dc537f8f8359c70b66f5000192bb280b41b9 /drivers/gpu/drm/exynos/exynos5433_drm_decon.c | |
| parent | bb63f726f98bec032c7322a9c36eb4167307d856 (diff) | |
| parent | fc4f000bf8c0cbf38f44de6bd5e225574e572ed4 (diff) | |
| download | linux-56d94d70398f0fbb1863a03a145db1a86f009a71.tar.xz | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos5433_drm_decon.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 1bf6a21..162ab93 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -93,7 +93,7 @@ static int decon_enable_vblank(struct exynos_drm_crtc *crtc) if (test_bit(BIT_SUSPENDED, &ctx->flags)) return -EPERM; - if (test_and_set_bit(BIT_IRQS_ENABLED, &ctx->flags)) { + if (!test_and_set_bit(BIT_IRQS_ENABLED, &ctx->flags)) { val = VIDINTCON0_INTEN; if (ctx->out_type == IFTYPE_I80) val |= VIDINTCON0_FRAMEDONE; @@ -402,8 +402,6 @@ static void decon_enable(struct exynos_drm_crtc *crtc) decon_enable_vblank(ctx->crtc); decon_commit(ctx->crtc); - - set_bit(BIT_SUSPENDED, &ctx->flags); } static void decon_disable(struct exynos_drm_crtc *crtc) @@ -582,9 +580,9 @@ out: static int exynos5433_decon_suspend(struct device *dev) { struct decon_context *ctx = dev_get_drvdata(dev); - int i; + int i = ARRAY_SIZE(decon_clks_name); - for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) + while (--i >= 0) clk_disable_unprepare(ctx->clks[i]); return 0; |