mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Neil Armstrong <neil.armstrong@linaro.org>
To: Vikash Garodia <vikash.garodia@oss.qualcomm.com>,
	Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>,
	Abhinav Kumar <abhinav.kumar@linux.dev>,
	Bryan O'Donoghue <bod@kernel.org>,
	Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] media: qcom: iris: gen2: subscribe to the picture type on the encoder instance
Date: Wed, 18 Nov 2026 09:49:03 +0100	[thread overview]
Message-ID: <a641c291-115d-4aca-a0f5-71dafcaee898@linaro.org> (raw)
In-Reply-To: <20261117-topic-iris-encoder-fixes-v1-1-169ce990d12d@linaro.org>

On 11/17/26 16:21, Neil Armstrong wrote:
> The GEN2 iris expects the HFI_PROP_PICTURE_TYPE for the encoded
> buffers, but HFI_PROP_PICTURE_TYPE is never subscribed for the
> ENCODER instance in iris_hfi_gen2_subscribe_property().
> 
> Add the necessary tables along the vdec input and output properties
> table for the GEN2 hardware.
> 
> The tables are aligned with the vdec and downstream iris driver
> implementation subscribing to HFI_PROP_NO_OUTPUT for the input
> queue and HFI_PROP_PICTURE_TYPE for the output queue.

Sashiko recommended that I add:
Fixes: 92e007ca5ab6 ("media: iris: Add V4L2 streaming support for encoder video device")

will do in v2

> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
>   drivers/media/platform/qcom/iris/iris_hfi_gen2.c   | 23 ++++++++++++++++++++++
>   .../platform/qcom/iris/iris_hfi_gen2_command.c     | 15 +++++++++-----
>   .../platform/qcom/iris/iris_platform_common.h      |  5 +++++
>   3 files changed, 38 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c
> index 79bbd06ef8d2..3b0fb408f05d 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c
> @@ -1906,6 +1906,14 @@ static const u32 sm8550_vdec_subscribe_output_properties_av1[] = {
>   	HFI_PROP_WORST_COMPLEXITY_FACTOR,
>   };
>   
> +static const u32 sm8550_venc_subscribe_input_properties[] = {
> +	HFI_PROP_NO_OUTPUT,
> +};
> +
> +static const u32 sm8550_venc_subscribe_output_properties[] = {
> +	HFI_PROP_PICTURE_TYPE,
> +};
> +
>   static const u32 sm8550_dec_ip_int_buf_tbl[] = {
>   	BUF_BIN,
>   	BUF_COMV,
> @@ -1985,6 +1993,11 @@ const struct iris_firmware_data iris_hfi_gen2_data = {
>   	.dec_output_prop_av1_size =
>   		ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_av1),
>   
> +	.enc_input_prop = sm8550_venc_subscribe_input_properties,
> +	.enc_input_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_input_properties),
> +	.enc_output_prop = sm8550_venc_subscribe_output_properties,
> +	.enc_output_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_output_properties),
> +
>   	.dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl,
>   	.dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl),
>   	.dec_op_int_buf_tbl = sm8550_dec_op_int_buf_tbl,
> @@ -2032,6 +2045,11 @@ const struct iris_firmware_data iris_hfi_milos_data = {
>   	.enc_output_config_params_size =
>   		ARRAY_SIZE(sm8550_venc_output_config_params),
>   
> +	.enc_input_prop = sm8550_venc_subscribe_input_properties,
> +	.enc_input_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_input_properties),
> +	.enc_output_prop = sm8550_venc_subscribe_output_properties,
> +	.enc_output_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_output_properties),
> +
>   	.dec_input_prop = sm8550_vdec_subscribe_input_properties,
>   	.dec_input_prop_size = ARRAY_SIZE(sm8550_vdec_subscribe_input_properties),
>   	.dec_output_prop_avc = sm8550_vdec_subscribe_output_properties_avc,
> @@ -2920,6 +2938,11 @@ const struct iris_firmware_data iris_hfi_gen2_ar50lt_data = {
>   	.enc_output_config_params_size =
>   		ARRAY_SIZE(sm8550_venc_output_config_params),
>   
> +	.enc_input_prop = sm8550_venc_subscribe_input_properties,
> +	.enc_input_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_input_properties),
> +	.enc_output_prop = sm8550_venc_subscribe_output_properties,
> +	.enc_output_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_output_properties),
> +
>   	.dec_input_prop = sm8550_vdec_subscribe_input_properties,
>   	.dec_input_prop_size = ARRAY_SIZE(sm8550_vdec_subscribe_input_properties),
>   	.dec_output_prop_avc = sm8550_vdec_subscribe_output_properties_avc,
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> index 388a36ff2b07..6131d22c579f 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> @@ -1059,12 +1059,17 @@ static int iris_hfi_gen2_subscribe_property(struct iris_inst *inst, u32 plane)
>   
>   	payload[0] = HFI_MODE_PROPERTY;
>   
> -	if (inst->domain == ENCODER)
> -		return 0;
> -
>   	if (V4L2_TYPE_IS_OUTPUT(plane)) {
> -		subscribe_prop_size = core->iris_firmware_data->dec_input_prop_size;
> -		subcribe_prop = core->iris_firmware_data->dec_input_prop;
> +		if (inst->domain == ENCODER) {
> +			subscribe_prop_size = core->iris_firmware_data->enc_input_prop_size;
> +			subcribe_prop = core->iris_firmware_data->enc_input_prop;
> +		} else {
> +			subscribe_prop_size = core->iris_firmware_data->dec_input_prop_size;
> +			subcribe_prop = core->iris_firmware_data->dec_input_prop;
> +		}
> +	} else if (inst->domain == ENCODER) {
> +		subscribe_prop_size = core->iris_firmware_data->enc_output_prop_size;
> +		subcribe_prop = core->iris_firmware_data->enc_output_prop;
>   	} else {
>   		switch (inst->codec) {
>   		case V4L2_PIX_FMT_H264:
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> index cddab9a9c375..cf5ae420f646 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> @@ -303,6 +303,11 @@ struct iris_firmware_data {
>   	const u32 *dec_output_prop_av1;
>   	unsigned int dec_output_prop_av1_size;
>   
> +	const u32 *enc_input_prop;
> +	unsigned int enc_input_prop_size;
> +	const u32 *enc_output_prop;
> +	unsigned int enc_output_prop_size;
> +
>   	const u32 *dec_ip_int_buf_tbl;
>   	unsigned int dec_ip_int_buf_tbl_size;
>   	const u32 *dec_op_int_buf_tbl;
> 


  reply	other threads:[~2026-11-18  8:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 15:21 [PATCH 0/2] media: qcom: iris: gen2 encoder picture type subscription and operating rate fixups Neil Armstrong
2026-11-17 15:21 ` [PATCH 1/2] media: qcom: iris: gen2: subscribe to the picture type on the encoder instance Neil Armstrong
2026-11-18  8:49   ` Neil Armstrong [this message]
2026-11-17 15:21 ` [PATCH 2/2] media: qcom: iris: venc: drop operating rate to match spec Neil Armstrong
2026-11-18  8:51   ` Neil Armstrong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a641c291-115d-4aca-a0f5-71dafcaee898@linaro.org \
    --to=neil.armstrong@linaro.org \
    --cc=abhinav.kumar@linux.dev \
    --cc=bod@kernel.org \
    --cc=dikshita.agarwal@oss.qualcomm.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=vikash.garodia@oss.qualcomm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®