Skip to content

Commit

Permalink
drm/exynos/decon5433: kill BIT_CLKS_ENABLED flag
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrzej Hajda authored and Inki Dae committed Jun 1, 2017
1 parent 358eccc commit 3643e75
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions drivers/gpu/drm/exynos/exynos5433_drm_decon.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ static const char * const decon_clks_name[] = {
};

enum decon_flag_bits {
BIT_CLKS_ENABLED,
BIT_WIN_UPDATED,
BIT_SUSPENDED
};
Expand Down Expand Up @@ -486,8 +485,6 @@ static void decon_enable(struct exynos_drm_crtc *crtc)

exynos_drm_pipe_clk_enable(crtc, true);

set_bit(BIT_CLKS_ENABLED, &ctx->flags);

decon_swreset(ctx);

decon_commit(ctx->crtc);
Expand Down Expand Up @@ -515,8 +512,6 @@ static void decon_disable(struct exynos_drm_crtc *crtc)

decon_swreset(ctx);

clear_bit(BIT_CLKS_ENABLED, &ctx->flags);

exynos_drm_pipe_clk_enable(crtc, false);

pm_runtime_put_sync(ctx->dev);
Expand All @@ -528,8 +523,7 @@ static irqreturn_t decon_te_irq_handler(int irq, void *dev_id)
{
struct decon_context *ctx = dev_id;

if (!test_bit(BIT_CLKS_ENABLED, &ctx->flags) ||
(ctx->out_type & I80_HW_TRG))
if (ctx->out_type & I80_HW_TRG)
return IRQ_HANDLED;

decon_set_bits(ctx, DECON_TRIGCON, TRIGCON_SWTRIGCMD, ~0);
Expand Down Expand Up @@ -654,9 +648,6 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id)
struct decon_context *ctx = dev_id;
u32 val;

if (!test_bit(BIT_CLKS_ENABLED, &ctx->flags))
goto out;

val = readl(ctx->addr + DECON_VIDINTCON1);
val &= VIDINTCON1_INTFRMDONEPEND | VIDINTCON1_INTFRMPEND;

Expand All @@ -672,7 +663,6 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id)
decon_handle_vblank(ctx);
}

out:
return IRQ_HANDLED;
}

Expand Down

0 comments on commit 3643e75

Please sign in to comment.