diff options
| author | Lloyd Atkinson <latkinso@codeaurora.org> | 2016-11-24 13:21:13 -0500 |
|---|---|---|
| committer | Lloyd Atkinson <latkinso@codeaurora.org> | 2016-11-24 13:22:28 -0500 |
| commit | e0dbb43938e493b3163b35887dadcb0f3d08dfb0 (patch) | |
| tree | 7de861705a371f862bfa864e949da68c760fbd4b /drivers/gpu | |
| parent | 194211db5de17efb8442e9989862bb53918c27ce (diff) | |
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 <latkinso@codeaurora.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c | 13 |
1 files changed, 2 insertions, 11 deletions
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) |