Re: [PATCH v2 18/24] media: iris: Add support for G/S_PARM for encoder video device

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 8/14/2025 8:31 PM, Vikash Garodia wrote:
> 
> 
> On 8/13/2025 3:08 PM, Dikshita Agarwal wrote:
>> Add supports for the G/S_PARM V4L2 ioctls for encoder video device with
>> necessary hooks. This allows userspace to query the current streaming
>> parameters such as frame intervals and set desired streaming parameters
>> primarily the frame rate.
>>
>> Tested-by: Vikash Garodia <quic_vgarodia@xxxxxxxxxxx> # X1E80100
>> Signed-off-by: Dikshita Agarwal <quic_dikshita@xxxxxxxxxxx>
>> ---
>>  drivers/media/platform/qcom/iris/iris_instance.h   |  5 ++
>>  .../platform/qcom/iris/iris_platform_common.h      |  2 +
>>  .../media/platform/qcom/iris/iris_platform_gen2.c  |  4 +-
>>  .../platform/qcom/iris/iris_platform_qcs8300.h     |  2 +
>>  .../platform/qcom/iris/iris_platform_sm8250.c      |  2 +
>>  drivers/media/platform/qcom/iris/iris_utils.c      | 36 ++++++++
>>  drivers/media/platform/qcom/iris/iris_utils.h      |  2 +
>>  drivers/media/platform/qcom/iris/iris_vb2.c        | 17 ----
>>  drivers/media/platform/qcom/iris/iris_venc.c       | 95 ++++++++++++++++++++++
>>  drivers/media/platform/qcom/iris/iris_venc.h       |  2 +
>>  drivers/media/platform/qcom/iris/iris_vidc.c       | 30 +++++++
>>  11 files changed, 179 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
>> index 55cf9702111829ef24189986ba5245c7684bfe11..b75549718df3c87cd85aecfc74c873c60cd4bde5 100644
>> --- a/drivers/media/platform/qcom/iris/iris_instance.h
>> +++ b/drivers/media/platform/qcom/iris/iris_instance.h
>> @@ -61,6 +61,9 @@ struct iris_fmt {
>>   * @metadata_idx: index for metadata buffer
>>   * @codec: codec type
>>   * @last_buffer_dequeued: a flag to indicate that last buffer is sent by driver
>> + * @frame_rate: frame rate of current instance
>> + * @operating_rate: operating rate of current instance
>> +
>>   */
>>  
>>  struct iris_inst {
>> @@ -96,6 +99,8 @@ struct iris_inst {
>>  	u32				metadata_idx;
>>  	u32				codec;
>>  	bool				last_buffer_dequeued;
>> +	u32				frame_rate;
>> +	u32				operating_rate;
>>  };
>>  
>>  #endif
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
>> index 792f46e2e34fd564a1ed61523f72826fc8f74582..d0b84c93aef409b51a767ba11f91c6ce2533f27f 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
>> @@ -79,6 +79,8 @@ struct platform_inst_caps {
>>  	u32 mb_cycles_fw;
>>  	u32 mb_cycles_fw_vpp;
>>  	u32 num_comv;
>> +	u32 max_frame_rate;
>> +	u32 max_operating_rate;
>>  };
>>  
>>  enum platform_inst_fw_cap_type {
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
>> index 1e2fadfe17672029b46e07ce00a8e31e0711fd58..e047fb75a99a6372dac4ad029baea16034cac633 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
>> @@ -209,6 +209,8 @@ static struct platform_inst_caps platform_inst_cap_sm8550 = {
>>  	.mb_cycles_fw = 489583,
>>  	.mb_cycles_fw_vpp = 66234,
>>  	.num_comv = 0,
>> +	.max_frame_rate = MAXIMUM_FPS << 16,
>> +	.max_operating_rate = MAXIMUM_FPS << 16,
>>  };
>>  
>>  static void iris_set_sm8550_preset_registers(struct iris_core *core)
>> @@ -502,7 +504,7 @@ struct iris_platform_data qcs8300_data = {
>>  	.num_vpp_pipe = 2,
>>  	.max_session_count = 16,
>>  	.max_core_mbpf = ((4096 * 2176) / 256) * 4,
>> -	.max_core_mbps = ((7680 * 4320) / 256) * 60, //TODO confirm!!
>> +	.max_core_mbps = (((3840 * 2176) / 256) * 120),
>>  	.input_config_params_default =
>>  		sm8550_vdec_input_config_params_default,
>>  	.input_config_params_default_size =
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
>> index a8d66ed388a34e6bb45d4a089d981bb7d135fb50..22e485b0b2ae8f110d2f3b817e202d1aa7d227fd 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
>> @@ -197,4 +197,6 @@ static struct platform_inst_caps platform_inst_cap_qcs8300 = {
>>  	.mb_cycles_fw = 326389,
>>  	.mb_cycles_fw_vpp = 44156,
>>  	.num_comv = 0,
>> +	.max_frame_rate = MAXIMUM_FPS << 16,
>> +	.max_operating_rate = MAXIMUM_FPS << 16,
>>  };
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
>> index 2a3cbe1f2d4b27d3cce9e9cdad1525801d71a041..5d59a5a3172a510b3a38f7c9c29dffd919fafce7 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
>> @@ -40,6 +40,8 @@ static struct platform_inst_caps platform_inst_cap_sm8250 = {
>>  	.max_mbpf = 138240,
>>  	.mb_cycles_vsp = 25,
>>  	.mb_cycles_vpp = 200,
>> +	.max_frame_rate = MAXIMUM_FPS << 16,
>> +	.max_operating_rate = MAXIMUM_FPS << 16,
>>  };
>>  
>>  static void iris_set_sm8250_preset_registers(struct iris_core *core)
>> diff --git a/drivers/media/platform/qcom/iris/iris_utils.c b/drivers/media/platform/qcom/iris/iris_utils.c
>> index 83c70d6a2d9092615dcf1b7d0fc85110f0df1aa0..f0af926879d5d90c56222aa8d48998a34be1c636 100644
>> --- a/drivers/media/platform/qcom/iris/iris_utils.c
>> +++ b/drivers/media/platform/qcom/iris/iris_utils.c
>> @@ -88,3 +88,39 @@ struct iris_inst *iris_get_instance(struct iris_core *core, u32 session_id)
>>  	mutex_unlock(&core->lock);
>>  	return NULL;
>>  }
>> +
>> +int iris_check_core_mbpf(struct iris_inst *inst)
>> +{
>> +	struct iris_core *core = inst->core;
>> +	struct iris_inst *instance;
>> +	u32 total_mbpf = 0;
>> +
>> +	mutex_lock(&core->lock);
>> +	list_for_each_entry(instance, &core->instances, list)
>> +		total_mbpf += iris_get_mbpf(instance);
>> +	mutex_unlock(&core->lock);
>> +
>> +	if (total_mbpf > core->iris_platform_data->max_core_mbpf)
>> +		return -ENOMEM;
>> +
>> +	return 0;
>> +}
>> +
>> +int iris_check_core_mbps(struct iris_inst *inst)
>> +{
>> +	struct iris_core *core = inst->core;
>> +	struct iris_inst *instance;
>> +	u32 total_mbps = 0, fps = 0;
>> +
>> +	mutex_lock(&core->lock);
>> +	list_for_each_entry(instance, &core->instances, list) {
>> +		fps = max(instance->frame_rate >> 16, instance->operating_rate >> 16);
>> +		total_mbps += iris_get_mbpf(instance) * fps;
>> +	}
>> +	mutex_unlock(&core->lock);
>> +
>> +	if (total_mbps > core->iris_platform_data->max_core_mbps)
>> +		return -ENOMEM;
>> +
>> +	return 0;
>> +}
>> diff --git a/drivers/media/platform/qcom/iris/iris_utils.h b/drivers/media/platform/qcom/iris/iris_utils.h
>> index 49869cf7a376880a026f44ff3883a6b13c6fcfbb..75740181122f5bdf93d64d3f43b3a26a9fe97919 100644
>> --- a/drivers/media/platform/qcom/iris/iris_utils.h
>> +++ b/drivers/media/platform/qcom/iris/iris_utils.h
>> @@ -49,5 +49,7 @@ struct iris_inst *iris_get_instance(struct iris_core *core, u32 session_id);
>>  void iris_helper_buffers_done(struct iris_inst *inst, unsigned int type,
>>  			      enum vb2_buffer_state state);
>>  int iris_wait_for_session_response(struct iris_inst *inst, bool is_flush);
>> +int iris_check_core_mbpf(struct iris_inst *inst);
>> +int iris_check_core_mbps(struct iris_inst *inst);
>>  
>>  #endif
>> diff --git a/drivers/media/platform/qcom/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c
>> index e62ed7a57df2debf0a930ad8307e6d945f589922..e32f7e1f007228a3b2b51cd76cd193d852f16080 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vb2.c
>> +++ b/drivers/media/platform/qcom/iris/iris_vb2.c
>> @@ -12,23 +12,6 @@
>>  #include "iris_vdec.h"
>>  #include "iris_power.h"
>>  
>> -static int iris_check_core_mbpf(struct iris_inst *inst)
>> -{
>> -	struct iris_core *core = inst->core;
>> -	struct iris_inst *instance;
>> -	u32 total_mbpf = 0;
>> -
>> -	mutex_lock(&core->lock);
>> -	list_for_each_entry(instance, &core->instances, list)
>> -		total_mbpf += iris_get_mbpf(instance);
>> -	mutex_unlock(&core->lock);
>> -
>> -	if (total_mbpf > core->iris_platform_data->max_core_mbpf)
>> -		return -ENOMEM;
>> -
>> -	return 0;
>> -}
>> -
>>  static int iris_check_inst_mbpf(struct iris_inst *inst)
>>  {
>>  	struct platform_inst_caps *caps;
>> diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
>> index 930f5afe9489d01be193f1dbe429d33f5401b468..11666f40a4d1c34e1b6eca0b5e40e0f09eeb2b67 100644
>> --- a/drivers/media/platform/qcom/iris/iris_venc.c
>> +++ b/drivers/media/platform/qcom/iris/iris_venc.c
>> @@ -58,6 +58,9 @@ int iris_venc_inst_init(struct iris_inst *inst)
>>  	inst->crop.width = f->fmt.pix_mp.width;
>>  	inst->crop.height = f->fmt.pix_mp.height;
>>  
>> +	inst->operating_rate = DEFAULT_FPS << 16;
>> +	inst->frame_rate = DEFAULT_FPS << 16;
> 
> I understand that firmware expects the rate in Q16 format, but does driver needs
> to keep it in that format ? I see most of the time in calculations, it is right
> shifted to bring it back to normal one and then back n forth.
> 

Currently in driver inst->frame_rate is in Q16 format everywhere, no
inconsistency.

do you prefer to keep it in non Q16 format and convert to Q16 when setting
to firmware?

>> +
>>  	return 0;
>>  }
>>  
>> @@ -325,3 +328,95 @@ int iris_venc_s_selection(struct iris_inst *inst, struct v4l2_selection *s)
>>  
>>  	return 0;
>>  }
>> +
>> +int iris_venc_s_param(struct iris_inst *inst, struct v4l2_streamparm *s_parm)
>> +{
>> +	struct platform_inst_caps *caps = inst->core->iris_platform_data->inst_caps;
>> +	struct vb2_queue *src_q = v4l2_m2m_get_src_vq(inst->m2m_ctx);
>> +	struct vb2_queue *dst_q = v4l2_m2m_get_dst_vq(inst->m2m_ctx);
>> +	struct v4l2_fract *timeperframe = NULL;
>> +	u32 default_rate = DEFAULT_FPS;
>> +	bool is_frame_rate = false;
>> +	u32 q16_rate, max_rate;
>> +	u64 us_per_frame, fps;
>> +	int ret = 0;
>> +
>> +	if (s_parm->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
>> +		timeperframe = &s_parm->parm.output.timeperframe;
>> +		max_rate = caps->max_operating_rate >> 16;
>> +		s_parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME;
>> +	} else {
>> +		timeperframe = &s_parm->parm.capture.timeperframe;
>> +		is_frame_rate = true;
>> +		max_rate = caps->max_frame_rate >> 16;
>> +		s_parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
>> +	}
>> +
>> +	if (!timeperframe->denominator || !timeperframe->numerator) {
>> +		if (!timeperframe->numerator)
>> +			timeperframe->numerator = 1;
>> +		if (!timeperframe->denominator)
>> +			timeperframe->denominator = default_rate;
>> +	}
>> +
>> +	us_per_frame = timeperframe->numerator * (u64)USEC_PER_SEC;
>> +	do_div(us_per_frame, timeperframe->denominator);
>> +
>> +	if (!us_per_frame)
>> +		return -EINVAL;
>> +
>> +	fps = (u64)USEC_PER_SEC;
>> +	do_div(fps, us_per_frame);
>> +	ret = fps > max_rate;
>> +	if (ret) {
> 
> if (fps > max_rate)

Sure.

> 
>> +		ret = -ENOMEM;
>> +		goto reset_rate;
>> +	}
>> +
>> +	q16_rate = (u32)fps << 16;
>> +	if (is_frame_rate)
>> +		inst->frame_rate = q16_rate;
>> +	else
>> +		inst->operating_rate = q16_rate;
>> +
>> +	if ((s_parm->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && vb2_is_streaming(src_q)) ||
>> +	    (s_parm->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && vb2_is_streaming(dst_q))) {
>> +		ret = iris_check_core_mbpf(inst);
>> +		if (ret)
>> +			goto reset_rate;
>> +		ret = iris_check_core_mbps(inst);
>> +		if (ret)
>> +			goto reset_rate;
>> +	}
>> +
>> +	return 0;
>> +
>> +reset_rate:
>> +	if (ret) {
>> +		if (is_frame_rate)
>> +			inst->frame_rate = default_rate << 16;
>> +		else
>> +			inst->operating_rate = default_rate << 16;
>> +	}
>> +
>> +	return ret;
>> +}
>> +
>> +int iris_venc_g_param(struct iris_inst *inst, struct v4l2_streamparm *s_parm)
>> +{
>> +	struct v4l2_fract *timeperframe = NULL;
>> +
>> +	if (s_parm->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
>> +		timeperframe = &s_parm->parm.output.timeperframe;
>> +		timeperframe->numerator = 1;
>> +		timeperframe->denominator = inst->operating_rate >> 16;
>> +		s_parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME;
>> +	} else {
>> +		timeperframe = &s_parm->parm.capture.timeperframe;
>> +		timeperframe->numerator = 1;
>> +		timeperframe->denominator = inst->frame_rate >> 16;
>> +		s_parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
>> +	}
>> +
>> +	return 0;
>> +}
>> diff --git a/drivers/media/platform/qcom/iris/iris_venc.h b/drivers/media/platform/qcom/iris/iris_venc.h
>> index 72c6e25d87113baa6d2219ae478b7d7df1aed7bf..0d566b7fc89b96b8fbc62a35b2ba795ca0bcf460 100644
>> --- a/drivers/media/platform/qcom/iris/iris_venc.h
>> +++ b/drivers/media/platform/qcom/iris/iris_venc.h
>> @@ -16,5 +16,7 @@ int iris_venc_s_fmt(struct iris_inst *inst, struct v4l2_format *f);
>>  int iris_venc_validate_format(struct iris_inst *inst, u32 pixelformat);
>>  int iris_venc_subscribe_event(struct iris_inst *inst, const struct v4l2_event_subscription *sub);
>>  int iris_venc_s_selection(struct iris_inst *inst, struct v4l2_selection *s);
>> +int iris_venc_g_param(struct iris_inst *inst, struct v4l2_streamparm *s_parm);
>> +int iris_venc_s_param(struct iris_inst *inst, struct v4l2_streamparm *s_parm);
>>  
>>  #endif
>> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
>> index 2074682a35fd1c4c9f5d29fdaee3392d98bf8923..4c11cdac19f97d08a9e6242eea74649aad0242cf 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
>> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
>> @@ -532,6 +532,34 @@ static int iris_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subs
>>  	return -EINVAL;
>>  }
>>  
>> +static int iris_s_parm(struct file *filp, void *fh, struct v4l2_streamparm *a)
>> +{
>> +	struct iris_inst *inst = container_of(fh, struct iris_inst, fh);
>> +
>> +	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
>> +	    a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
>> +		return -EINVAL;
>> +
>> +	if (inst->domain == ENCODER)
>> +		return iris_venc_s_param(inst, a);
>> +	else
>> +		return -EINVAL;
>> +}
>> +
>> +static int iris_g_parm(struct file *filp, void *fh, struct v4l2_streamparm *a)
>> +{
>> +	struct iris_inst *inst = container_of(fh, struct iris_inst, fh);
>> +
>> +	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
>> +	    a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
>> +		return -EINVAL;
>> +
>> +	if (inst->domain == ENCODER)
>> +		return iris_venc_g_param(inst, a);
>> +	else
>> +		return -EINVAL;
>> +}
>> +
>>  static int iris_dec_cmd(struct file *filp, void *fh,
>>  			struct v4l2_decoder_cmd *dec)
>>  {
>> @@ -628,6 +656,8 @@ static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops_enc = {
>>  	.vidioc_unsubscribe_event       = v4l2_event_unsubscribe,
>>  	.vidioc_g_selection             = iris_g_selection,
>>  	.vidioc_s_selection             = iris_s_selection,
>> +	.vidioc_s_parm                  = iris_s_parm,
>> +	.vidioc_g_parm                  = iris_g_parm,
>>  };
>>  
>>  void iris_init_ops(struct iris_core *core)
>>




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [Linux for Sparc]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux