Re: [PATCH v6 13/28] media: iris: implement subscribe_event and unsubscribe_event ioctls

[Hans Verkuil]

On 20/11/2024 15:46, Dikshita Agarwal wrote:
> From: Vedang Nagar <quic_vnagar@xxxxxxxxxxx>
> 
> Implement subscribe_event and unsubscribe_event iocts with necessary
> hooks.
> 
> Signed-off-by: Vedang Nagar <quic_vnagar@xxxxxxxxxxx>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@xxxxxxxxxxx>
> ---
>  drivers/media/platform/qcom/iris/iris_instance.h |  2 ++
>  drivers/media/platform/qcom/iris/iris_vdec.c     | 25 ++++++++++++++++++++++++
>  drivers/media/platform/qcom/iris/iris_vdec.h     |  1 +
>  drivers/media/platform/qcom/iris/iris_vidc.c     | 10 ++++++++++
>  4 files changed, 38 insertions(+)
> 
> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
> index 1e9a6075357f..ef4515d2086c 100644
> --- a/drivers/media/platform/qcom/iris/iris_instance.h
> +++ b/drivers/media/platform/qcom/iris/iris_instance.h
> @@ -30,6 +30,7 @@
>   * @once_per_session_set: boolean to set once per session property
>   * @m2m_dev:	a reference to m2m device structure
>   * @m2m_ctx:	a reference to m2m context structure
> + * @subscriptions: variable to hold current events subscriptions
>   */
>  
>  struct iris_inst {
> @@ -48,6 +49,7 @@ struct iris_inst {
>  	bool				once_per_session_set;
>  	struct v4l2_m2m_dev		*m2m_dev;
>  	struct v4l2_m2m_ctx		*m2m_ctx;
> +	unsigned int			subscriptions;
>  };
>  
>  #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
> index 742b45432481..9afeb681b7a7 100644
> --- a/drivers/media/platform/qcom/iris/iris_vdec.c
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.c
> @@ -3,6 +3,7 @@
>   * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
>   */
>  
> +#include <media/v4l2-event.h>
>  #include <media/v4l2-mem2mem.h>
>  
>  #include "iris_buffer.h"
> @@ -193,3 +194,27 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f)
>  
>  	return 0;
>  }
> +
> +int iris_vdec_subscribe_event(struct iris_inst *inst, const struct v4l2_event_subscription *sub)
> +{
> +	int ret = 0;
> +
> +	switch (sub->type) {
> +	case V4L2_EVENT_EOS:
> +		ret = v4l2_event_subscribe(&inst->fh, sub, 0, NULL);
> +		inst->subscriptions |= V4L2_EVENT_EOS;
> +		break;
> +	case V4L2_EVENT_SOURCE_CHANGE:
> +		ret = v4l2_src_change_event_subscribe(&inst->fh, sub);
> +		inst->subscriptions |= V4L2_EVENT_SOURCE_CHANGE;
> +		break;
> +	case V4L2_EVENT_CTRL:
> +		ret = v4l2_ctrl_subscribe_event(&inst->fh, sub);
> +		inst->subscriptions |= V4L2_EVENT_CTRL;

No need to keep track of which events are subscribed to. Leave that to the event
framework.

See also my comment to patch 20/28.

Regards,

	Hans

> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	return ret;
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.h b/drivers/media/platform/qcom/iris/iris_vdec.h
> index ae456676e578..f64ce3234e6a 100644
> --- a/drivers/media/platform/qcom/iris/iris_vdec.h
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.h
> @@ -13,5 +13,6 @@ void iris_vdec_inst_deinit(struct iris_inst *inst);
>  int iris_vdec_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f);
>  int iris_vdec_try_fmt(struct iris_inst *inst, struct v4l2_format *f);
>  int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f);
> +int iris_vdec_subscribe_event(struct iris_inst *inst, const struct v4l2_event_subscription *sub);
>  
>  #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
> index bc77dfc2ba67..3a138172e674 100644
> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
> @@ -4,6 +4,7 @@
>   */
>  
>  #include <linux/pm_runtime.h>
> +#include <media/v4l2-event.h>
>  #include <media/v4l2-ioctl.h>
>  #include <media/v4l2-mem2mem.h>
>  
> @@ -322,6 +323,13 @@ static int iris_g_selection(struct file *filp, void *fh, struct v4l2_selection *
>  	return 0;
>  }
>  
> +static int iris_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subscription *sub)
> +{
> +	struct iris_inst *inst = container_of(fh, struct iris_inst, fh);
> +
> +	return iris_vdec_subscribe_event(inst, sub);
> +}
> +
>  static struct v4l2_file_operations iris_v4l2_file_ops = {
>  	.owner                          = THIS_MODULE,
>  	.open                           = iris_open,
> @@ -347,6 +355,8 @@ static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops = {
>  	.vidioc_enum_framesizes         = iris_enum_framesizes,
>  	.vidioc_reqbufs                 = v4l2_m2m_ioctl_reqbufs,
>  	.vidioc_g_selection             = iris_g_selection,
> +	.vidioc_subscribe_event         = iris_subscribe_event,
> +	.vidioc_unsubscribe_event       = v4l2_event_unsubscribe,
>  };
>  
>  void iris_init_ops(struct iris_core *core)
>