Skip to content

Commit c908282

Browse files
author
Dikshita Agarwal
committed
FROMLIST: media: iris: Improve last flag handling
Improve the handling of the V4L2_BUF_FLAG_LAST flag in the driver: - Ensure that the last flag is not sent multiple times. - Attach the last flag to the first capture buffer returned during flush, triggered by a sequence change, addressing cases where the firmware does not set the last flag. Link: https://lore.kernel.org/linux-arm-msm/20250509-video-iris-hevc-vp9-v5-19-59b4ff7d331c@quicinc.com/ Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-HDK Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-QRD Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK Tested-by: Vikash Garodia <quic_vgarodia@quicinc.com> # on sa8775p-ride Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
1 parent d8ee749 commit c908282

5 files changed

Lines changed: 13 additions & 2 deletions

File tree

drivers/media/platform/qcom/iris/iris_buffer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf)
636636
v4l2_event_queue_fh(&inst->fh, &ev);
637637
v4l2_m2m_mark_stopped(m2m_ctx);
638638
}
639+
inst->last_buffer_dequeued = true;
639640
}
640641

641642
state = VB2_BUF_STATE_DONE;

drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,12 @@ static void iris_hfi_gen1_session_ftb_done(struct iris_inst *inst, void *packet)
457457
timestamp_us = timestamp_hi;
458458
timestamp_us = (timestamp_us << 32) | timestamp_lo;
459459
} else {
460-
flags |= V4L2_BUF_FLAG_LAST;
460+
if (pkt->stream_id == 1 && !inst->last_buffer_dequeued) {
461+
if (iris_drc_pending(inst)) {
462+
flags |= V4L2_BUF_FLAG_LAST;
463+
inst->last_buffer_dequeued = true;
464+
}
465+
}
461466
}
462467
buf->timestamp = timestamp_us;
463468

drivers/media/platform/qcom/iris/iris_instance.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
* @sequence_out: a sequence counter for output queue
4444
* @tss: timestamp metadata
4545
* @metadata_idx: index for metadata buffer
46+
* @last_buffer_dequeued: a flag to indicate that last buffer is sent by driver
4647
*/
4748

4849
struct iris_inst {
@@ -74,6 +75,7 @@ struct iris_inst {
7475
u32 sequence_out;
7576
struct iris_ts_metadata tss[VIDEO_MAX_FRAME];
7677
u32 metadata_idx;
78+
bool last_buffer_dequeued;
7779
};
7880

7981
#endif

drivers/media/platform/qcom/iris/iris_vb2.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ void iris_vb2_buf_queue(struct vb2_buffer *vb2)
305305
goto exit;
306306
}
307307

308-
if (V4L2_TYPE_IS_CAPTURE(vb2->vb2_queue->type)) {
308+
if (!inst->last_buffer_dequeued && V4L2_TYPE_IS_CAPTURE(vb2->vb2_queue->type)) {
309309
if ((inst->sub_state & IRIS_INST_SUB_DRC &&
310310
inst->sub_state & IRIS_INST_SUB_DRC_LAST) ||
311311
(inst->sub_state & IRIS_INST_SUB_DRAIN &&
@@ -319,6 +319,7 @@ void iris_vb2_buf_queue(struct vb2_buffer *vb2)
319319
v4l2_event_queue_fh(&inst->fh, &eos);
320320
v4l2_m2m_mark_stopped(m2m_ctx);
321321
}
322+
inst->last_buffer_dequeued = true;
322323
goto exit;
323324
}
324325
}

drivers/media/platform/qcom/iris/iris_vdec.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ static int iris_vdec_process_streamon_output(struct iris_inst *inst)
487487
if (ret)
488488
return ret;
489489

490+
inst->last_buffer_dequeued = false;
491+
490492
return iris_inst_change_sub_state(inst, clear_sub_state, 0);
491493
}
492494

0 commit comments

Comments
 (0)