iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: aspeed-video: ignore interrupts that aren't enabled

Browse Source 
As partially addressed in commit 65d270acb2d6 ("media: aspeed: clear
garbage interrupts"), the ASpeed video engine sometimes asserts
interrupts that the driver hasn't enabled.  In addition to the
CAPTURE_COMPLETE and FRAME_COMPLETE interrupts dealt with in that
patch, COMP_READY has also been observed.  Instead of playing
whack-a-mole with each one individually, we can instead just blanket
ignore everything we haven't explicitly enabled.

Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Tested-by: Lei YU <yulei.sh@bytedance.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Zev Weiss 2021-06-18 00:02:29 +02:00 committed by Mauro Carvalho Chehab
parent 35d2969ea3
commit ea8a5c118e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/aspeed-video.c
View File

@ -563,6 +563,12 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
struct aspeed_video *video = arg;
u32 sts = aspeed_video_read(video, VE_INTERRUPT_STATUS);
/*
* Hardware sometimes asserts interrupts that we haven't actually
* enabled; ignore them if so.
*/
sts &= aspeed_video_read(video, VE_INTERRUPT_CTRL);
/*
* Resolution changed or signal was lost; reset the engine and
* re-initialize
@ -629,16 +635,6 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
aspeed_video_start_frame(video);
}
/*
* CAPTURE_COMPLETE and FRAME_COMPLETE interrupts come even when these
* are disabled in the VE_INTERRUPT_CTRL register so clear them to
* prevent unnecessary interrupt calls.
*/
if (sts & VE_INTERRUPT_CAPTURE_COMPLETE)
sts &= ~VE_INTERRUPT_CAPTURE_COMPLETE;
if (sts & VE_INTERRUPT_FRAME_COMPLETE)
sts &= ~VE_INTERRUPT_FRAME_COMPLETE;
return sts ? IRQ_NONE : IRQ_HANDLED;
}