diff options
| author | Rahul Sharma <rahul.sharma@samsung.com> | 2014-05-28 08:11:11 +0200 |
|---|---|---|
| committer | Inki Dae <daeinki@gmail.com> | 2014-06-01 19:07:12 +0200 |
| commit | 972145c741df9a259f3cdc89c974b6e1bfadcf6e (patch) | |
| tree | f0875b4df9c01e1ac9c332516c22f61750f49ae5 | |
| parent | drm/exynos: Fix checkpatch warning in exynos_dp_reg.c (diff) | |
| download | linux-972145c741df9a259f3cdc89c974b6e1bfadcf6e.tar.xz linux-972145c741df9a259f3cdc89c974b6e1bfadcf6e.zip | |
drm/exynos: remove hardware overlays disable from fimd probe
System hangs when FIMD registers are accessed to disable
hardware overlays. This is because of the clocks which are
not enabled before register access.
'Hardware overlay disable' is cleaned from the FIMD probe.
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index bd30d0c05950..2ec634f7930a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -703,19 +703,6 @@ static void fimd_win_disable(struct exynos_drm_manager *mgr, int zpos) win_data->enabled = false; } -static void fimd_clear_win(struct fimd_context *ctx, int win) -{ - writel(0, ctx->regs + WINCON(win)); - writel(0, ctx->regs + VIDOSD_A(win)); - writel(0, ctx->regs + VIDOSD_B(win)); - writel(0, ctx->regs + VIDOSD_C(win)); - - if (win == 1 || win == 2) - writel(0, ctx->regs + VIDOSD_D(win)); - - fimd_shadow_protect_win(ctx, win, false); -} - static void fimd_window_suspend(struct exynos_drm_manager *mgr) { struct fimd_context *ctx = mgr->ctx; @@ -898,16 +885,12 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) { struct fimd_context *ctx = fimd_manager.ctx; struct drm_device *drm_dev = data; - int win; fimd_mgr_initialize(&fimd_manager, drm_dev); exynos_drm_crtc_create(&fimd_manager); if (ctx->display) exynos_drm_create_enc_conn(drm_dev, ctx->display); - for (win = 0; win < WINDOWS_NR; win++) - fimd_clear_win(ctx, win); - return 0; } |