raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2026-01-05 02:37:41 +00:00
Code Issues Projects Releases Wiki Activity

media: bcm2835-unicam: Correctly handle FS + FE ISR condtion

Browse Source 
If we get a simultaneous FS + FE interrupt for the same frame, it cannot be
marked as completed and returned to userland as the framebuffer will be refilled
by Unicam on the next sensor frame. Additionally, the timestamp will be set to 0
as the FS interrupt handling code will not have run yet.

To avoid these problems, the frame is considered dropped in the FE handler,
and will be returned to userland on the subsequent sensor frame.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
This commit is contained in:
Naushir Patuck
2022-08-08 10:01:41 +01:00
committed by Phil Elwell
parent 0c61d40e7f
commit e6f0bf2a57
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/platform/bcm2835/bcm2835-unicam.c
View File

@@ -920,7 +920,9 @@ static irqreturn_t unicam_isr(int irq, void *dev)
* to use.
*/
for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
if (!unicam->node[i].streaming)
struct unicam_node *node = &unicam->node[i];
if (!node->streaming)
continue;
/*
@@ -930,14 +932,24 @@ static irqreturn_t unicam_isr(int irq, void *dev)
* + FS + LS). In this case, we cannot signal the buffer
* as complete, as the HW will reuse that buffer.
*/
if (unicam->node[i].cur_frm &&
unicam->node[i].cur_frm != unicam->node[i].next_frm) {
unicam_process_buffer_complete(&unicam->node[i],
sequence);
unicam->node[i].cur_frm = unicam->node[i].next_frm;
unicam->node[i].next_frm = NULL;
if (node->cur_frm && node->cur_frm != node->next_frm) {
/*
* This condition checks if FE + FS for the same
* frame has occurred. In such cases, we cannot
* return out the frame, as no buffer handling
* or timestamping has yet been done as part of
* the FS handler.
*/
if (!node->cur_frm->vb.vb2_buf.timestamp) {
unicam_dbg(2, unicam, "ISR: FE without FS, dropping frame\n");
continue;
}
unicam_process_buffer_complete(node, sequence);
node->cur_frm = node->next_frm;
node->next_frm = NULL;
} else {
unicam->node[i].cur_frm = unicam->node[i].next_frm;
node->cur_frm = node->next_frm;
}
}
unicam->sequence++;