Commit afbc0ae9 authored by Nikhil Devshatwar's avatar Nikhil Devshatwar Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarNikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 4e4676d2

drivers/media/platform/ti-vpe/vpdma.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/ti-vpe/vpdma.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/ti-vpe/vpe.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}