Commit f8a02b37 authored by Jae Hyun Yoo's avatar Jae Hyun Yoo Committed by Mauro Carvalho Chehab

media: aspeed: remove checking of VE_INTERRUPT_CAPTURE_COMPLETE

VE_INTERRUPT_CAPTURE_COMPLETE and VE_INTERRUPT_COMP_COMPLETE are
not set at the same time but the current interrupt handling
mechanism of this driver doesn't clear the interrupt flag until
both two are set, and this behavior causes unnecessary interrupt
handler calls. In fact, this driver provides JPEG format only so
taking care of the VE_INTERRUPT_COMP_COMPLETE is enough for getting
compressed image frame so this commit gets rid of the
VE_INTERRUPT_CAPTURE_COMPLETE checking logic to simplify the logic.
Handling of VE_INTERRUPT_CAPTURE_COMPLETE could be added back later
when it's actually needed.
Signed-off-by: default avatarJae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Reviewed-by: default avatarEddie James <eajames@linux.ibm.com>
Reviewed-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 084b6790
...@@ -463,8 +463,7 @@ static int aspeed_video_start_frame(struct aspeed_video *video) ...@@ -463,8 +463,7 @@ static int aspeed_video_start_frame(struct aspeed_video *video)
aspeed_video_write(video, VE_COMP_ADDR, addr); aspeed_video_write(video, VE_COMP_ADDR, addr);
aspeed_video_update(video, VE_INTERRUPT_CTRL, 0, aspeed_video_update(video, VE_INTERRUPT_CTRL, 0,
VE_INTERRUPT_COMP_COMPLETE | VE_INTERRUPT_COMP_COMPLETE);
VE_INTERRUPT_CAPTURE_COMPLETE);
aspeed_video_update(video, VE_SEQ_CTRL, 0, aspeed_video_update(video, VE_SEQ_CTRL, 0,
VE_SEQ_CTRL_TRIG_CAPTURE | VE_SEQ_CTRL_TRIG_COMP); VE_SEQ_CTRL_TRIG_CAPTURE | VE_SEQ_CTRL_TRIG_COMP);
...@@ -568,8 +567,7 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) ...@@ -568,8 +567,7 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
} }
} }
if ((sts & VE_INTERRUPT_COMP_COMPLETE) && if (sts & VE_INTERRUPT_COMP_COMPLETE) {
(sts & VE_INTERRUPT_CAPTURE_COMPLETE)) {
struct aspeed_video_buffer *buf; struct aspeed_video_buffer *buf;
u32 frame_size = aspeed_video_read(video, u32 frame_size = aspeed_video_read(video,
VE_OFFSET_COMP_STREAM); VE_OFFSET_COMP_STREAM);
...@@ -598,11 +596,9 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) ...@@ -598,11 +596,9 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
VE_SEQ_CTRL_FORCE_IDLE | VE_SEQ_CTRL_FORCE_IDLE |
VE_SEQ_CTRL_TRIG_COMP, 0); VE_SEQ_CTRL_TRIG_COMP, 0);
aspeed_video_update(video, VE_INTERRUPT_CTRL, aspeed_video_update(video, VE_INTERRUPT_CTRL,
VE_INTERRUPT_COMP_COMPLETE | VE_INTERRUPT_COMP_COMPLETE, 0);
VE_INTERRUPT_CAPTURE_COMPLETE, 0);
aspeed_video_write(video, VE_INTERRUPT_STATUS, aspeed_video_write(video, VE_INTERRUPT_STATUS,
VE_INTERRUPT_COMP_COMPLETE | VE_INTERRUPT_COMP_COMPLETE);
VE_INTERRUPT_CAPTURE_COMPLETE);
if (test_bit(VIDEO_STREAMING, &video->flags) && buf) if (test_bit(VIDEO_STREAMING, &video->flags) && buf)
aspeed_video_start_frame(video); aspeed_video_start_frame(video);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment