Commit 0df5e4ac authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Inki Dae

drm/exynos/mixer: replace MXR_INT_EN register cache with flag

Driver uses only VSYNC interrupts, so we need to cache VSYNC bit state only.
Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Reviewed-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent a44652e8
...@@ -71,6 +71,7 @@ enum mixer_version_id { ...@@ -71,6 +71,7 @@ enum mixer_version_id {
enum mixer_flag_bits { enum mixer_flag_bits {
MXR_BIT_POWERED, MXR_BIT_POWERED,
MXR_BIT_VSYNC,
}; };
struct mixer_context { struct mixer_context {
...@@ -84,7 +85,6 @@ struct mixer_context { ...@@ -84,7 +85,6 @@ struct mixer_context {
bool interlace; bool interlace;
bool vp_enabled; bool vp_enabled;
bool has_sclk; bool has_sclk;
u32 int_en;
struct mixer_resources mixer_res; struct mixer_resources mixer_res;
enum mixer_version_id mxr_ver; enum mixer_version_id mxr_ver;
...@@ -902,10 +902,9 @@ static int mixer_enable_vblank(struct exynos_drm_crtc *crtc) ...@@ -902,10 +902,9 @@ static int mixer_enable_vblank(struct exynos_drm_crtc *crtc)
struct mixer_context *mixer_ctx = crtc->ctx; struct mixer_context *mixer_ctx = crtc->ctx;
struct mixer_resources *res = &mixer_ctx->mixer_res; struct mixer_resources *res = &mixer_ctx->mixer_res;
if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) { __set_bit(MXR_BIT_VSYNC, &mixer_ctx->flags);
mixer_ctx->int_en |= MXR_INT_EN_VSYNC; if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
return 0; return 0;
}
/* enable vsync interrupt */ /* enable vsync interrupt */
mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC); mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC);
...@@ -919,10 +918,10 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc) ...@@ -919,10 +918,10 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc)
struct mixer_context *mixer_ctx = crtc->ctx; struct mixer_context *mixer_ctx = crtc->ctx;
struct mixer_resources *res = &mixer_ctx->mixer_res; struct mixer_resources *res = &mixer_ctx->mixer_res;
if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) { __clear_bit(MXR_BIT_VSYNC, &mixer_ctx->flags);
mixer_ctx->int_en &= MXR_INT_EN_VSYNC;
if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
return; return;
}
/* disable vsync interrupt */ /* disable vsync interrupt */
mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC); mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC);
...@@ -1035,9 +1034,10 @@ static void mixer_enable(struct exynos_drm_crtc *crtc) ...@@ -1035,9 +1034,10 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET); mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);
if (ctx->int_en & MXR_INT_EN_VSYNC) if (test_bit(MXR_BIT_VSYNC, &ctx->flags)) {
mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC); mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC);
mixer_reg_write(res, MXR_INT_EN, ctx->int_en); mixer_reg_writemask(res, MXR_INT_EN, ~0, MXR_INT_EN_VSYNC);
}
mixer_win_reset(ctx); mixer_win_reset(ctx);
} }
...@@ -1056,8 +1056,6 @@ static void mixer_disable(struct exynos_drm_crtc *crtc) ...@@ -1056,8 +1056,6 @@ static void mixer_disable(struct exynos_drm_crtc *crtc)
for (i = 0; i < MIXER_WIN_NR; i++) for (i = 0; i < MIXER_WIN_NR; i++)
mixer_win_disable(crtc, i); mixer_win_disable(crtc, i);
ctx->int_en = mixer_reg_read(res, MXR_INT_EN);
clear_bit(MXR_BIT_POWERED, &ctx->flags); clear_bit(MXR_BIT_POWERED, &ctx->flags);
clk_disable_unprepare(res->hdmi); clk_disable_unprepare(res->hdmi);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment