Re: [PATCH 5/8] media: iris: remove duplicateion between generic gen2 data and qcs8300

Dmitry Baryshkov
2025-10-08T19:15:22Z

On Wed, Oct 08, 2025 at 10:07:47AM +0200, Konrad Dybcio wrote:
> On 10/8/25 6:33 AM, Dmitry Baryshkov wrote:
> > Now as we have removed PIPE value from inst_fw_caps_dec there should be
> > no difference between inst_fw_caps of QCS8300 and SM8550+. Drop the
> > QCS8300-specific tables and use generic one instead.
> >
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > ---
>
> [...]
>
> > +static struct platform_inst_caps platform_inst_cap_qcs8300 = {
> > + .min_frame_width = 96,
> > + .max_frame_width = 4096,
> > + .min_frame_height = 96,
> > + .max_frame_height = 4096,
> > + .max_mbpf = (4096 * 2176) / 256,
> > + .mb_cycles_vpp = 200,
> > + .mb_cycles_fw = 326389,
> > + .mb_cycles_fw_vpp = 44156,
> > + .num_comv = 0,
> > + .max_frame_rate = MAXIMUM_FPS,
> > + .max_operating_rate = MAXIMUM_FPS,
> > +};
> > +
> > const struct iris_platform_data qcs8300_data = {
> > .get_instance = iris_hfi_gen2_get_instance,
> > .init_hfi_command_ops = iris_hfi_gen2_command_ops_init,
> > @@ -1022,10 +1030,10 @@ const struct iris_platform_data qcs8300_data = {
> > .fwname = "qcom/vpu/vpu30_p4_s6.mbn",
> > .pas_id = IRIS_PAS_ID,
> > .inst_caps = &platform_inst_cap_qcs8300,
> > - .inst_fw_caps_dec = inst_fw_cap_qcs8300_dec,
> > - .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_qcs8300_dec),
> > - .inst_fw_caps_enc = inst_fw_cap_qcs8300_enc,
> > - .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_qcs8300_enc),
> > + .inst_fw_caps_dec = inst_fw_cap_sm8550_dec,
> > + .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8550_dec),
> > + .inst_fw_caps_enc = inst_fw_cap_sm8550_enc,
> > + .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8550_enc),
>
> 8550 enc data has a .set() under a number of caps (was qcs8300 tested?)

Welcome to a non-conflict merge issue. Commit d22037f3fd33 ("media:
iris: Set platform capabilities to firmware for encoder video device")
added .set callbacks, while commit 6bdfa3f947a7 ("media: iris: Add
platform-specific capabilities for encoder video device") extended
QCS8300 config. Nobody noticed that the second file should also be
updated, which is yet another reason for merging those two structures.

> and also additionally defines:
>
> * INPUT_BUF_HOST_MAX_COUNT
> * OUTPUT_BUF_HOST_MAX_COUNT

Good question. I hope the defaults should be fine...

>
> values of which should probably be cross-checked (they say "DEFAULT"
> so it's probably OK, but just so you know)
>
> dec is 1 : 1
>
> Konrad

--
With best wishes
Dmitry