diff options
| author | Dhaval Patel <pdhaval@quicinc.com> | 2016-11-27 14:39:09 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-27 14:39:09 -0800 |
| commit | 07b6d2ceb7c3fbc1a8dca2c811ea7bbd9717eb3e (patch) | |
| tree | 3b31627342f63718aa4419339a09e8a81eeb24e1 | |
| parent | d42ca87d059a3d23af0912972d0154d1631b8e8d (diff) | |
| parent | e0dbb43938e493b3163b35887dadcb0f3d08dfb0 (diff) | |
Merge "drm/msm/sde: fix cmd mode vblank irq control" into dev/msm-4.4-drm_kms
| -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) |