From e0dbb43938e493b3163b35887dadcb0f3d08dfb0 Mon Sep 17 00:00:00 2001 From: Lloyd Atkinson Date: Thu, 24 Nov 2016 13:21:13 -0500 Subject: drm/msm/sde: fix cmd mode vblank irq control Fix previous merge conflict that disabled the pingpong done irq on vblank off instead of the pingpong read pointer as intended. Change-Id: I707437b54f2878d0da7b0d3b5618fdafa0ff38d5 Signed-off-by: Lloyd Atkinson --- drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c b/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c index 9dcd4d4114b3..e9a65eb1bb71 100644 --- a/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c +++ b/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c @@ -389,21 +389,12 @@ static int sde_encoder_phys_cmd_control_vblank_irq( if (enable && atomic_inc_return(&phys_enc->vblank_refcount) == 1) ret = sde_encoder_phys_cmd_register_irq(phys_enc, SDE_IRQ_TYPE_PING_PONG_RD_PTR, - INTR_IDX_PINGPONG, + INTR_IDX_RDPTR, sde_encoder_phys_cmd_pp_rd_ptr_irq, "pp_rd_ptr"); else if (!enable && atomic_dec_return(&phys_enc->vblank_refcount) == 0) ret = sde_encoder_phys_cmd_unregister_irq(phys_enc, - INTR_IDX_PINGPONG); - - if (enable) - ret = sde_encoder_phys_cmd_register_irq(phys_enc, - SDE_IRQ_TYPE_PING_PONG_RD_PTR, - INTR_IDX_RDPTR, - sde_encoder_phys_cmd_pp_rd_ptr_irq, "pp_rd_ptr"); - else - ret = sde_encoder_phys_cmd_unregister_irq(phys_enc, - INTR_IDX_RDPTR); + INTR_IDX_RDPTR); end: if (ret) -- cgit v1.2.3