drm/exynos/decon5433: simplify shadow protect code

There is no point in protecting only particular windows during update.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 3bae2fc8dcb6e807af07e321ab6840ab13981524..42e8f8c74bb06824f366b9eb8cf10752aa777b49 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -313,23 +313,20 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
        writel(val, ctx->addr + DECON_WINCONx(win));
 }
 
-static void decon_shadow_protect_win(struct decon_context *ctx, int win,
-                                       bool protect)
+static void decon_shadow_protect(struct decon_context *ctx, bool protect)
 {
-       decon_set_bits(ctx, DECON_SHADOWCON, SHADOWCON_Wx_PROTECT(win),
+       decon_set_bits(ctx, DECON_SHADOWCON, SHADOWCON_PROTECT_MASK,
                       protect ? ~0 : 0);
 }
 
 static void decon_atomic_begin(struct exynos_drm_crtc *crtc)
 {
        struct decon_context *ctx = crtc->ctx;
-       int i;
 
        if (test_bit(BIT_SUSPENDED, &ctx->flags))
                return;
 
-       for (i = ctx->first_win; i < WINDOWS_NR; i++)
-               decon_shadow_protect_win(ctx, i, true);
+       decon_shadow_protect(ctx, true);
 }
 
 #define BIT_VAL(x, e, s) (((x) & ((1 << ((e) - (s) + 1)) - 1)) << (s))
@@ -412,15 +409,13 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
 {
        struct decon_context *ctx = crtc->ctx;
        unsigned long flags;
-       int i;
 
        if (test_bit(BIT_SUSPENDED, &ctx->flags))
                return;
 
        spin_lock_irqsave(&ctx->vblank_lock, flags);
 
-       for (i = ctx->first_win; i < WINDOWS_NR; i++)
-               decon_shadow_protect_win(ctx, i, false);
+       decon_shadow_protect(ctx, false);
 
        decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);
 
@@ -540,11 +535,10 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc)
                        goto err;
        }
 
-       for (win = 0; win < WINDOWS_NR; win++) {
-               decon_shadow_protect_win(ctx, win, true);
+       decon_shadow_protect(ctx, true);
+       for (win = 0; win < WINDOWS_NR; win++)
                decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0);
-               decon_shadow_protect_win(ctx, win, false);
-       }
+       decon_shadow_protect(ctx, false);
 
        decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);
 

diff --git a/include/video/exynos5433_decon.h b/include/video/exynos5433_decon.h
index 6b083d327e982c0c5deb7895ce6e7c6b1094c8a6..78957c9626f5880f302e1cf08fc5a44b2e40dcf3 100644 (file)
--- a/include/video/exynos5433_decon.h
+++ b/include/video/exynos5433_decon.h
@@ -118,6 +118,7 @@
 #define WINCONx_ENWIN_F                        (1 << 0)
 
 /* SHADOWCON */
+#define SHADOWCON_PROTECT_MASK         GENMASK(14, 10)
 #define SHADOWCON_Wx_PROTECT(n)                (1 << (10 + (n)))
 
 /* VIDOSDxD */