diff options
| author | YoungJun Cho <yj44.cho@samsung.com> | 2014-11-17 22:00:09 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2014-11-24 18:02:53 +0900 |
| commit | 74944a58f9def188d506d3eef19fd34f293219f7 (patch) | |
| tree | 2fad1a498590b86eeae1355c3938676f9aff4983 /drivers/gpu/drm/exynos/exynos_drm_fimd.c | |
| parent | 9b67eb7365725ed00dde4714d71d4afe205329b2 (diff) | |
| download | op-kernel-dev-74944a58f9def188d506d3eef19fd34f293219f7.zip op-kernel-dev-74944a58f9def188d506d3eef19fd34f293219f7.tar.gz | |
drm/exynos: fimd: move shadow unprotection position
The C#_EN_F in SHADOWCON register is updated per frame.
So it should be protected by fimd_shadow_protect_win().
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_fimd.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index ec2d170..77ba961 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -751,15 +751,15 @@ static void fimd_win_commit(struct exynos_drm_manager *mgr, int zpos) val |= WINCONx_ENWIN; writel(val, ctx->regs + WINCON(win)); - /* Enable DMA channel and unprotect windows */ - fimd_shadow_protect_win(ctx, win, false); - if (ctx->driver_data->has_shadowcon) { val = readl(ctx->regs + SHADOWCON); val |= SHADOWCON_CHx_ENABLE(win); writel(val, ctx->regs + SHADOWCON); } + /* Enable DMA channel and unprotect windows */ + fimd_shadow_protect_win(ctx, win, false); + win_data->enabled = true; if (ctx->i80_if) |
