UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/exynos/decon5433: kill BIT_CLKS_ENABLED flag 

The flag was used to check if IRQ handlers can touch HW. Since driver
enables IRQs only if hardware is enabled the flag becomes redundant.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Andrzej Hajda 2017-04-05 09:28:34 +02:00 committed by Inki Dae
parent 358eccc0ee
commit 3643e75874
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/exynos/exynos5433_drm_decon.c
View File

@ -48,7 +48,6 @@ static const char * const decon_clks_name[] = {
}; };
enum decon_flag_bits { enum decon_flag_bits {
BIT_CLKS_ENABLED,
BIT_WIN_UPDATED, BIT_WIN_UPDATED,
BIT_SUSPENDED BIT_SUSPENDED
}; };
@ -486,8 +485,6 @@ static void decon_enable(struct exynos_drm_crtc *crtc)
exynos_drm_pipe_clk_enable(crtc, true); exynos_drm_pipe_clk_enable(crtc, true);
set_bit(BIT_CLKS_ENABLED, &ctx->flags);
decon_swreset(ctx); decon_swreset(ctx);
decon_commit(ctx->crtc); decon_commit(ctx->crtc);
@ -515,8 +512,6 @@ static void decon_disable(struct exynos_drm_crtc *crtc)
decon_swreset(ctx); decon_swreset(ctx);
clear_bit(BIT_CLKS_ENABLED, &ctx->flags);
exynos_drm_pipe_clk_enable(crtc, false); exynos_drm_pipe_clk_enable(crtc, false);
pm_runtime_put_sync(ctx->dev); pm_runtime_put_sync(ctx->dev);
@ -528,8 +523,7 @@ static irqreturn_t decon_te_irq_handler(int irq, void *dev_id)
{ {
struct decon_context *ctx = dev_id; struct decon_context *ctx = dev_id;
if (!test_bit(BIT_CLKS_ENABLED, &ctx->flags) || if (ctx->out_type & I80_HW_TRG)
(ctx->out_type & I80_HW_TRG))
return IRQ_HANDLED; return IRQ_HANDLED;
decon_set_bits(ctx, DECON_TRIGCON, TRIGCON_SWTRIGCMD, ~0); decon_set_bits(ctx, DECON_TRIGCON, TRIGCON_SWTRIGCMD, ~0);
@ -654,9 +648,6 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id)
struct decon_context *ctx = dev_id; struct decon_context *ctx = dev_id;
u32 val; u32 val;
if (!test_bit(BIT_CLKS_ENABLED, &ctx->flags))
goto out;
val = readl(ctx->addr + DECON_VIDINTCON1); val = readl(ctx->addr + DECON_VIDINTCON1);
val &= VIDINTCON1_INTFRMDONEPEND | VIDINTCON1_INTFRMPEND; val &= VIDINTCON1_INTFRMDONEPEND | VIDINTCON1_INTFRMPEND;
@ -672,7 +663,6 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id)
decon_handle_vblank(ctx); decon_handle_vblank(ctx);
} }
out:
return IRQ_HANDLED; return IRQ_HANDLED;
} }