diff options
| author | Nikhil Devshatwar <nikhil.nd@ti.com> | 2016-11-19 02:20:24 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-11-22 12:49:55 +0300 |
| commit | afbc0ae9a42e3a447365edc47ba4a206183566ac (patch) | |
| tree | d659bf9f9bb2c8bc8387150b56ad0545057d3fca /drivers | |
| parent | 4e4676d250efbc81c70e699fc1c805d3ab370e70 (diff) | |
| download | linux-afbc0ae9a42e3a447365edc47ba4a206183566ac.tar.xz | |
[media] media: ti-vpe: vpdma: Clear IRQs for individual lists
VPDMA IRQs are registered for multiple lists
When clearing an IRQ for a list interrupt, all the
IRQs for the individual lists are to be cleared separately.
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/ti-vpe/vpdma.c | 6 | ||||
| -rw-r--r-- | drivers/media/platform/ti-vpe/vpdma.h | 3 | ||||
| -rw-r--r-- | drivers/media/platform/ti-vpe/vpe.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti-vpe/vpdma.c index ffc281d2b065..c0a4e035bc2a 100644 --- a/drivers/media/platform/ti-vpe/vpdma.c +++ b/drivers/media/platform/ti-vpe/vpdma.c @@ -953,12 +953,12 @@ unsigned int vpdma_get_list_mask(struct vpdma_data *vpdma, int irq_num) EXPORT_SYMBOL(vpdma_get_list_mask); /* clear previosuly occured list intterupts in the LIST_STAT register */ -void vpdma_clear_list_stat(struct vpdma_data *vpdma, int irq_num) +void vpdma_clear_list_stat(struct vpdma_data *vpdma, int irq_num, + int list_num) { u32 reg_addr = VPDMA_INT_LIST0_STAT + VPDMA_INTX_OFFSET * irq_num; - write_reg(vpdma, reg_addr, - read_reg(vpdma, reg_addr)); + write_reg(vpdma, reg_addr, 3 << (list_num * 2)); } EXPORT_SYMBOL(vpdma_clear_list_stat); diff --git a/drivers/media/platform/ti-vpe/vpdma.h b/drivers/media/platform/ti-vpe/vpdma.h index f08f4370ce4a..65961147e8f7 100644 --- a/drivers/media/platform/ti-vpe/vpdma.h +++ b/drivers/media/platform/ti-vpe/vpdma.h @@ -244,7 +244,8 @@ int vpdma_list_cleanup(struct vpdma_data *vpdma, int list_num, /* vpdma list interrupt management */ void vpdma_enable_list_complete_irq(struct vpdma_data *vpdma, int irq_num, int list_num, bool enable); -void vpdma_clear_list_stat(struct vpdma_data *vpdma, int irq_num); +void vpdma_clear_list_stat(struct vpdma_data *vpdma, int irq_num, + int list_num); unsigned int vpdma_get_list_stat(struct vpdma_data *vpdma, int irq_num); unsigned int vpdma_get_list_mask(struct vpdma_data *vpdma, int irq_num); diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c index 151a9280bb85..6fcdd0ea50e4 100644 --- a/drivers/media/platform/ti-vpe/vpe.c +++ b/drivers/media/platform/ti-vpe/vpe.c @@ -1326,7 +1326,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data) if (irqst0) { if (irqst0 & VPE_INT0_LIST0_COMPLETE) - vpdma_clear_list_stat(ctx->dev->vpdma, 0); + vpdma_clear_list_stat(ctx->dev->vpdma, 0, 0); irqst0 &= ~(VPE_INT0_LIST0_COMPLETE); } |