From: "Cao, Bingbu" <bingbu.cao@intel.com>
To: Sakari Ailus <sakari.ailus@linux.intel.com>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>
Cc: Tsuchiya Yuto <kitakar@gmail.com>,
"Zhi, Yong" <yong.zhi@intel.com>,
"Qiu, Tian Shu" <tian.shu.qiu@intel.com>,
"laurent.pinchart@ideasonboard.com"
<laurent.pinchart@ideasonboard.com>
Subject: RE: [PATCH 2/5] ipu3-cio2: Serialise access to pad format
Date: Mon, 12 Oct 2020 01:34:06 +0000 [thread overview]
Message-ID: <DM6PR11MB3995BED477B95DCF0C537D1D99070@DM6PR11MB3995.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20201009150756.3397-3-sakari.ailus@linux.intel.com>
Sakari, thank you for the patch.
Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
________________________
BRs,
Bingbu Cao
> -----Original Message-----
> From: Sakari Ailus <sakari.ailus@linux.intel.com>
> Sent: Friday, October 9, 2020 11:08 PM
> To: linux-media@vger.kernel.org
> Cc: Tsuchiya Yuto <kitakar@gmail.com>; Cao, Bingbu <bingbu.cao@intel.com>;
> Zhi, Yong <yong.zhi@intel.com>; Qiu, Tian Shu <tian.shu.qiu@intel.com>;
> laurent.pinchart@ideasonboard.com
> Subject: [PATCH 2/5] ipu3-cio2: Serialise access to pad format
>
> Pad format can be accessed from user space. Serialise access to it.
>
> Fixes: c2a6a07afe4a ("media: intel-ipu3: cio2: add new MIPI-CSI2 driver")
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/pci/intel/ipu3/ipu3-cio2.c | 11 +++++++++++
> drivers/media/pci/intel/ipu3/ipu3-cio2.h | 1 +
> 2 files changed, 12 insertions(+)
>
> diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> index afa472026ba4..9c7b527a8800 100644
> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> @@ -1233,11 +1233,15 @@ static int cio2_subdev_get_fmt(struct v4l2_subdev
> *sd, {
> struct cio2_queue *q = container_of(sd, struct cio2_queue, subdev);
>
> + mutex_lock(&q->subdev_lock);
> +
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
> fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
> else
> fmt->format = q->subdev_fmt;
>
> + mutex_unlock(&q->subdev_lock);
> +
> return 0;
> }
>
> @@ -1261,6 +1265,8 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd,
> if (fmt->pad == CIO2_PAD_SOURCE)
> return cio2_subdev_get_fmt(sd, cfg, fmt);
>
> + mutex_lock(&q->subdev_lock);
> +
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> *v4l2_subdev_get_try_format(sd, cfg, fmt->pad) = fmt->format;
> } else {
> @@ -1271,6 +1277,8 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd,
> fmt->format = q->subdev_fmt;
> }
>
> + mutex_unlock(&q->subdev_lock);
> +
> return 0;
> }
>
> @@ -1529,6 +1537,7 @@ static int cio2_queue_init(struct cio2_device *cio2,
> struct cio2_queue *q)
>
> /* Initialize miscellaneous variables */
> mutex_init(&q->lock);
> + mutex_init(&q->subdev_lock);
>
> /* Initialize formats to default values */
> fmt = &q->subdev_fmt;
> @@ -1646,6 +1655,7 @@ static int cio2_queue_init(struct cio2_device *cio2,
> struct cio2_queue *q)
> cio2_fbpt_exit(q, &cio2->pci_dev->dev);
> fail_fbpt:
> mutex_destroy(&q->lock);
> + mutex_destroy(&q->subdev_lock);
>
> return r;
> }
> @@ -1658,6 +1668,7 @@ static void cio2_queue_exit(struct cio2_device *cio2,
> struct cio2_queue *q)
> media_entity_cleanup(&q->subdev.entity);
> cio2_fbpt_exit(q, &cio2->pci_dev->dev);
> mutex_destroy(&q->lock);
> + mutex_destroy(&q->subdev_lock);
> }
>
> static int cio2_queues_init(struct cio2_device *cio2) diff --git
> a/drivers/media/pci/intel/ipu3/ipu3-cio2.h
> b/drivers/media/pci/intel/ipu3/ipu3-cio2.h
> index 549b08f88f0c..146492383aa5 100644
> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.h
> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.h
> @@ -335,6 +335,7 @@ struct cio2_queue {
>
> /* Subdev, /dev/v4l-subdevX */
> struct v4l2_subdev subdev;
> + struct mutex subdev_lock; /* Serialise acces to subdev_fmt field */
> struct media_pad subdev_pads[CIO2_PADS];
> struct v4l2_mbus_framefmt subdev_fmt;
> atomic_t frame_sequence;
> --
> 2.27.0
next prev parent reply other threads:[~2020-10-12 1:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 15:07 [PATCH 0/5] ipu3-cio2 format fixes Sakari Ailus
2020-10-09 15:07 ` [PATCH 1/5] ipu3-cio2: Return actual subdev format Sakari Ailus
2020-10-12 1:50 ` Cao, Bingbu
2020-10-09 15:07 ` [PATCH 2/5] ipu3-cio2: Serialise access to pad format Sakari Ailus
2020-10-09 16:19 ` Andy Shevchenko
2020-10-12 1:34 ` Cao, Bingbu [this message]
2020-10-09 15:07 ` [PATCH 3/5] ipu3-cio2: Use unsigned values where appropriate Sakari Ailus
2020-10-09 17:16 ` Laurent Pinchart
2020-10-12 9:02 ` Sakari Ailus
2020-10-09 15:07 ` [PATCH 4/5] ipu3-cio2: Validate mbus format in setting subdev format Sakari Ailus
2020-10-09 16:22 ` Andy Shevchenko
2020-10-12 9:26 ` Sakari Ailus
2020-10-09 17:14 ` Laurent Pinchart
2020-10-09 15:07 ` [PATCH 5/5] ipu3-cio2: Make the field on subdev format V4L2_FIELD_NONE Sakari Ailus
2020-10-09 17:10 ` Laurent Pinchart
2020-10-12 1:44 ` Cao, Bingbu
2020-10-09 15:08 ` [PATCH 0/5] ipu3-cio2 format fixes Sakari Ailus
2020-10-09 16:23 ` Andy Shevchenko
2020-10-12 8:13 ` Sakari Ailus
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=DM6PR11MB3995BED477B95DCF0C537D1D99070@DM6PR11MB3995.namprd11.prod.outlook.com \
--to=bingbu.cao@intel.com \
--cc=kitakar@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tian.shu.qiu@intel.com \
--cc=yong.zhi@intel.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;
as well as URLs for NNTP newsgroup(s).