|
@@ -46,7 +46,8 @@ enum decon_flag_bits {
|
|
BIT_CLKS_ENABLED,
|
|
BIT_CLKS_ENABLED,
|
|
BIT_IRQS_ENABLED,
|
|
BIT_IRQS_ENABLED,
|
|
BIT_WIN_UPDATED,
|
|
BIT_WIN_UPDATED,
|
|
- BIT_SUSPENDED
|
|
|
|
|
|
+ BIT_SUSPENDED,
|
|
|
|
+ BIT_REQUEST_UPDATE
|
|
};
|
|
};
|
|
|
|
|
|
struct decon_context {
|
|
struct decon_context {
|
|
@@ -141,12 +142,6 @@ static void decon_commit(struct exynos_drm_crtc *crtc)
|
|
m->crtc_vsync_end = m->crtc_vsync_start + 1;
|
|
m->crtc_vsync_end = m->crtc_vsync_start + 1;
|
|
}
|
|
}
|
|
|
|
|
|
- decon_set_bits(ctx, DECON_VIDCON0, VIDCON0_ENVID, 0);
|
|
|
|
-
|
|
|
|
- /* enable clock gate */
|
|
|
|
- val = CMU_CLKGAGE_MODE_SFR_F | CMU_CLKGAGE_MODE_MEM_F;
|
|
|
|
- writel(val, ctx->addr + DECON_CMU);
|
|
|
|
-
|
|
|
|
if (ctx->out_type & (IFTYPE_I80 | I80_HW_TRG))
|
|
if (ctx->out_type & (IFTYPE_I80 | I80_HW_TRG))
|
|
decon_setup_trigger(ctx);
|
|
decon_setup_trigger(ctx);
|
|
|
|
|
|
@@ -315,6 +310,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
|
|
|
|
|
|
/* window enable */
|
|
/* window enable */
|
|
decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, ~0);
|
|
decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, ~0);
|
|
|
|
+ set_bit(BIT_REQUEST_UPDATE, &ctx->flags);
|
|
}
|
|
}
|
|
|
|
|
|
static void decon_disable_plane(struct exynos_drm_crtc *crtc,
|
|
static void decon_disable_plane(struct exynos_drm_crtc *crtc,
|
|
@@ -327,6 +323,7 @@ static void decon_disable_plane(struct exynos_drm_crtc *crtc,
|
|
return;
|
|
return;
|
|
|
|
|
|
decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0);
|
|
decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0);
|
|
|
|
+ set_bit(BIT_REQUEST_UPDATE, &ctx->flags);
|
|
}
|
|
}
|
|
|
|
|
|
static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
|
|
static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
|
|
@@ -340,8 +337,8 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
|
|
for (i = ctx->first_win; i < WINDOWS_NR; i++)
|
|
for (i = ctx->first_win; i < WINDOWS_NR; i++)
|
|
decon_shadow_protect_win(ctx, i, false);
|
|
decon_shadow_protect_win(ctx, i, false);
|
|
|
|
|
|
- /* standalone update */
|
|
|
|
- decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);
|
|
|
|
|
|
+ if (test_and_clear_bit(BIT_REQUEST_UPDATE, &ctx->flags))
|
|
|
|
+ decon_set_bits(ctx, DECON_UPDATE, STANDALONE_UPDATE_F, ~0);
|
|
|
|
|
|
if (ctx->out_type & IFTYPE_I80)
|
|
if (ctx->out_type & IFTYPE_I80)
|
|
set_bit(BIT_WIN_UPDATED, &ctx->flags);
|
|
set_bit(BIT_WIN_UPDATED, &ctx->flags);
|