@@ -562,14 +562,15 @@ static int iris_hfi_gen1_set_resolution(struct iris_inst *inst)
struct hfi_framesize fs;
int ret;
- fs.buffer_type = HFI_BUFFER_INPUT;
- fs.width = inst->fmt_src->fmt.pix_mp.width;
- fs.height = inst->fmt_src->fmt.pix_mp.height;
-
- ret = hfi_gen1_set_property(inst, ptype, &fs, sizeof(fs));
- if (ret)
- return ret;
+ if (!inst->in_reconfig) {
+ fs.buffer_type = HFI_BUFFER_INPUT;
+ fs.width = inst->fmt_src->fmt.pix_mp.width;
+ fs.height = inst->fmt_src->fmt.pix_mp.height;
+ ret = hfi_gen1_set_property(inst, ptype, &fs, sizeof(fs));
+ if (ret)
+ return ret;
+ }
fs.buffer_type = HFI_BUFFER_OUTPUT2;
fs.width = inst->fmt_dst->fmt.pix_mp.width;
fs.height = inst->fmt_dst->fmt.pix_mp.height;
@@ -155,6 +155,7 @@ static void iris_hfi_gen1_read_changed_params(struct iris_inst *inst,
inst->crop.height = event.height;
}
+ inst->in_reconfig = true;
inst->fw_min_count = event.buf_count;
inst->buffers[BUF_OUTPUT].min_count = iris_vpu_buf_count(inst, BUF_OUTPUT);
inst->buffers[BUF_OUTPUT].size = pixmp_op->plane_fmt[0].sizeimage;
@@ -43,6 +43,7 @@
* @tss: timestamp metadata
* @metadata_idx: index for metadata buffer
* @codec: codec type
+ * @in_reconfig: a flag raised by decoder when the stream resolution changes
*/
struct iris_inst {
@@ -74,6 +75,7 @@ struct iris_inst {
struct iris_ts_metadata tss[VIDEO_MAX_FRAME];
u32 metadata_idx;
u32 codec;
+ bool in_reconfig;
};
#endif
@@ -453,6 +453,8 @@ static int iris_vdec_process_streamon_input(struct iris_inst *inst)
if (ret)
return ret;
+ inst->in_reconfig = false;
+
return iris_inst_change_sub_state(inst, 0, set_sub_state);
}
@@ -544,6 +546,8 @@ static int iris_vdec_process_streamon_output(struct iris_inst *inst)
if (ret)
return ret;
+ inst->in_reconfig = false;
+
return iris_inst_change_sub_state(inst, clear_sub_state, 0);
}
During the reconfig, firmware sends the resolution aligned by 8 byte, if driver set the same resoluton to firmware, it will be aligned to 16 byte causing another sequence change which would be incorrect. Fix this by not setting the updated resolution to firmware during reconfig. Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com> --- .../platform/qcom/iris/iris_hfi_gen1_command.c | 15 ++++++++------- .../platform/qcom/iris/iris_hfi_gen1_response.c | 1 + drivers/media/platform/qcom/iris/iris_instance.h | 2 ++ drivers/media/platform/qcom/iris/iris_vdec.c | 4 ++++ 4 files changed, 15 insertions(+), 7 deletions(-)