iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/exynos: fimd: add fimd_enable_video_output() to cleanup

Browse Source 
This bit is used for video output and logic signal control.
So it is better for readability.

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>
This commit is contained in:
YoungJun Cho
2014-11-17 22:00:10 +09:00
committed by Inki Dae
parent 74944a58f9
commit f181a543c7
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/drm/exynos/exynos_drm_fimd.c
View File

@ -229,6 +229,19 @@ static void fimd_wait_for_vblank(struct exynos_drm_manager *mgr)
DRM_DEBUG_KMS("vblank wait timed out.\n"); DRM_DEBUG_KMS("vblank wait timed out.\n");
} }
static void fimd_enable_video_output(struct fimd_context *ctx, int win,
bool enable)
{
u32 val = readl(ctx->regs + WINCON(win));
if (enable)
val |= WINCONx_ENWIN;
else
val &= ~WINCONx_ENWIN;
writel(val, ctx->regs + WINCON(win));
}
static void fimd_clear_channel(struct exynos_drm_manager *mgr) static void fimd_clear_channel(struct exynos_drm_manager *mgr)
{ {
struct fimd_context *ctx = mgr->ctx; struct fimd_context *ctx = mgr->ctx;
@ -241,9 +254,7 @@ static void fimd_clear_channel(struct exynos_drm_manager *mgr)
u32 val = readl(ctx->regs + WINCON(win)); u32 val = readl(ctx->regs + WINCON(win));
if (val & WINCONx_ENWIN) { if (val & WINCONx_ENWIN) {
/* wincon */ fimd_enable_video_output(ctx, win, false);
val &= ~WINCONx_ENWIN;
writel(val, ctx->regs + WINCON(win));
/* unprotect windows */ /* unprotect windows */
if (ctx->driver_data->has_shadowcon) { if (ctx->driver_data->has_shadowcon) {
@ -746,10 +757,7 @@ static void fimd_win_commit(struct exynos_drm_manager *mgr, int zpos)
if (win != 0) if (win != 0)
fimd_win_set_colkey(ctx, win); fimd_win_set_colkey(ctx, win);
/* wincon */ fimd_enable_video_output(ctx, win, true);
val = readl(ctx->regs + WINCON(win));
val |= WINCONx_ENWIN;
writel(val, ctx->regs + WINCON(win));
if (ctx->driver_data->has_shadowcon) { if (ctx->driver_data->has_shadowcon) {
val = readl(ctx->regs + SHADOWCON); val = readl(ctx->regs + SHADOWCON);
@ -790,10 +798,7 @@ static void fimd_win_disable(struct exynos_drm_manager *mgr, int zpos)
/* protect windows */ /* protect windows */
fimd_shadow_protect_win(ctx, win, true); fimd_shadow_protect_win(ctx, win, true);
/* wincon */ fimd_enable_video_output(ctx, win, false);
val = readl(ctx->regs + WINCON(win));
val &= ~WINCONx_ENWIN;
writel(val, ctx->regs + WINCON(win));
/* unprotect windows */ /* unprotect windows */
if (ctx->driver_data->has_shadowcon) { if (ctx->driver_data->has_shadowcon) {