Skip to content

Commit

Permalink
drm/exynos/decon5433: kill BIT_IRQS_ENABLED flag
Browse files Browse the repository at this point in the history
Since DECON uses enable_irq/disable_irq to full control IRQs,
there is no point in having flags to trace it separately.
As a bonus condition for software trigger becomes always true,
so it can be removed.

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 b37d53a commit 358eccc
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/gpu/drm/exynos/exynos5433_drm_decon.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ static const char * const decon_clks_name[] = {

enum decon_flag_bits {
BIT_CLKS_ENABLED,
BIT_IRQS_ENABLED,
BIT_WIN_UPDATED,
BIT_SUSPENDED
};
Expand Down Expand Up @@ -112,16 +111,13 @@ static int decon_enable_vblank(struct exynos_drm_crtc *crtc)
if (!(ctx->out_type & I80_HW_TRG))
enable_irq(ctx->te_irq);

set_bit(BIT_IRQS_ENABLED, &ctx->flags);

return 0;
}

static void decon_disable_vblank(struct exynos_drm_crtc *crtc)
{
struct decon_context *ctx = crtc->ctx;

clear_bit(BIT_IRQS_ENABLED, &ctx->flags);
if (test_bit(BIT_SUSPENDED, &ctx->flags))
return;

Expand Down Expand Up @@ -536,9 +532,7 @@ static irqreturn_t decon_te_irq_handler(int irq, void *dev_id)
(ctx->out_type & I80_HW_TRG))
return IRQ_HANDLED;

if (test_and_clear_bit(BIT_WIN_UPDATED, &ctx->flags) ||
test_bit(BIT_IRQS_ENABLED, &ctx->flags))
decon_set_bits(ctx, DECON_TRIGCON, TRIGCON_SWTRIGCMD, ~0);
decon_set_bits(ctx, DECON_TRIGCON, TRIGCON_SWTRIGCMD, ~0);

return IRQ_HANDLED;
}
Expand Down

0 comments on commit 358eccc

Please sign in to comment.