media: qcom: iris: don't use function indirection in gen2-specific code

To note that iris_set_num_comv() is gen2-internal, rename it to
iris_hfi_gen2_set_num_comv() and then stop using hfi_ops indirection to
set session property (like other functions in this file do).

Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2026-03-29 02:33:04 +02:00 committed by Bryan O'Donoghue
parent 8550eebfca
commit c61331d240

View File

@ -1205,7 +1205,7 @@ static u32 iris_hfi_gen2_buf_type_from_driver(u32 domain, enum iris_buffer_type
}
}
static int iris_set_num_comv(struct iris_inst *inst)
static int iris_hfi_gen2_set_num_comv(struct iris_inst *inst)
{
struct platform_inst_caps *caps;
struct iris_core *core = inst->core;
@ -1220,12 +1220,12 @@ static int iris_set_num_comv(struct iris_inst *inst)
num_comv = (inst->codec == V4L2_PIX_FMT_AV1) ?
NUM_COMV_AV1 : caps->num_comv;
return core->hfi_ops->session_set_property(inst,
HFI_PROP_COMV_BUFFER_COUNT,
HFI_HOST_FLAGS_NONE,
HFI_PORT_BITSTREAM,
HFI_PAYLOAD_U32,
&num_comv, sizeof(u32));
return iris_hfi_gen2_session_set_property(inst,
HFI_PROP_COMV_BUFFER_COUNT,
HFI_HOST_FLAGS_NONE,
HFI_PORT_BITSTREAM,
HFI_PAYLOAD_U32,
&num_comv, sizeof(u32));
}
static void iris_hfi_gen2_get_buffer(u32 domain, struct iris_buffer *buffer,
@ -1257,7 +1257,7 @@ static int iris_hfi_gen2_session_queue_buffer(struct iris_inst *inst, struct iri
iris_hfi_gen2_get_buffer(inst->domain, buffer, &hfi_buffer);
if (buffer->type == BUF_COMV) {
ret = iris_set_num_comv(inst);
ret = iris_hfi_gen2_set_num_comv(inst);
if (ret)
return ret;
}