From: Hans de Goede <hdegoede@redhat.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
Tsuchiya Yuto <kitakar@gmail.com>,
Andy Shevchenko <andy@kernel.org>,
Yury Luneff <yury.lunev@gmail.com>,
Nable <nable.maininbox@googlemail.com>,
andrey.i.trufanov@gmail.com, Fabio Aiuto <fabioaiuto83@gmail.com>,
linux-media@vger.kernel.org, linux-staging@lists.linux.dev
Subject: [PATCH 09/17] media: atomisp: Drop streamoff_mutex
Date: Sun, 11 Sep 2022 19:16:45 +0200 [thread overview]
Message-ID: <20220911171653.568932-10-hdegoede@redhat.com> (raw)
In-Reply-To: <20220911171653.568932-1-hdegoede@redhat.com>
Now that __atomisp_streamoff() no longer drops isp->mutex to cancel
the watchdog timer, the streamoff_mutex is no longer necessary to
avoid multiple streamoffs racing with each other.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/staging/media/atomisp/pci/atomisp_fops.c | 2 --
drivers/staging/media/atomisp/pci/atomisp_internal.h | 6 ------
drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 3 ---
drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 1 -
4 files changed, 12 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
index e1b213ba4686..531bbd6d7ee0 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
@@ -822,7 +822,6 @@ static int atomisp_release(struct file *file)
if (!isp)
return -EBADF;
- mutex_lock(&isp->streamoff_mutex);
mutex_lock(&isp->mutex);
dev_dbg(isp->dev, "release device %s\n", vdev->name);
@@ -909,7 +908,6 @@ static int atomisp_release(struct file *file)
V4L2_SEL_TGT_COMPOSE, 0,
&clear_compose);
mutex_unlock(&isp->mutex);
- mutex_unlock(&isp->streamoff_mutex);
return v4l2_fh_release(file);
}
diff --git a/drivers/staging/media/atomisp/pci/atomisp_internal.h b/drivers/staging/media/atomisp/pci/atomisp_internal.h
index 2279d45e7d7a..f3ef840c640a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_internal.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_internal.h
@@ -239,12 +239,6 @@ struct atomisp_device {
/* Purpose of mutex is to protect and serialize use of isp data
* structures and css API calls. */
struct mutex mutex;
- /*
- * Serialise streamoff: mutex is dropped during streamoff to
- * cancel the watchdog queue. MUST be acquired BEFORE
- * "mutex".
- */
- struct mutex streamoff_mutex;
unsigned int input_cnt;
struct atomisp_input_subdev inputs[ATOM_ISP_MAX_INPUTS];
diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index 899157584951..6d84a7e9cb57 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -1872,7 +1872,6 @@ int __atomisp_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
atomisp_subdev_source_pad(vdev), asd->index);
lockdep_assert_held(&isp->mutex);
- lockdep_assert_held(&isp->streamoff_mutex);
if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
dev_dbg(isp->dev, "unsupported v4l2 buf type\n");
@@ -2081,11 +2080,9 @@ static int atomisp_streamoff(struct file *file, void *fh,
struct atomisp_device *isp = video_get_drvdata(vdev);
int rval;
- mutex_lock(&isp->streamoff_mutex);
mutex_lock(&isp->mutex);
rval = __atomisp_streamoff(file, fh, type);
mutex_unlock(&isp->mutex);
- mutex_unlock(&isp->streamoff_mutex);
return rval;
}
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index d55e8d32a286..4ab91858d308 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -1482,7 +1482,6 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
dev_dbg(&pdev->dev, "atomisp mmio base: %p\n", isp->base);
mutex_init(&isp->mutex);
- mutex_init(&isp->streamoff_mutex);
spin_lock_init(&isp->lock);
/* This is not a true PCI device on SoC, so the delay is not needed. */
--
2.37.3
next prev parent reply other threads:[~2022-09-11 17:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-11 17:16 [PATCH 00/17] media: atomisp: further cleanups / unwanted code removal Hans de Goede
2022-09-11 17:16 ` [PATCH 01/17] media: atomisp: Use a normal mutex for the main lock Hans de Goede
2022-09-12 11:11 ` Andy Shevchenko
2022-09-21 8:52 ` Hans de Goede
2022-09-21 11:52 ` Andy Shevchenko
2022-09-11 17:16 ` [PATCH 02/17] media: atomisp: Remove unused lock member from struct atomisp_sub_device Hans de Goede
2022-09-11 17:16 ` [PATCH 03/17] media: atomisp: Fix locking around asd->streaming read/write Hans de Goede
2022-09-12 11:26 ` Andy Shevchenko
2022-09-21 8:57 ` Hans de Goede
2022-09-11 17:16 ` [PATCH 04/17] media: atomisp: Remove asd == NULL checks from ioctl handling Hans de Goede
2022-09-11 17:16 ` [PATCH 05/17] media: atomisp: Add atomisp_pipe_check() helper Hans de Goede
2022-09-12 11:30 ` Andy Shevchenko
2022-09-21 9:05 ` Hans de Goede
2022-09-21 11:55 ` Andy Shevchenko
2022-09-11 17:16 ` [PATCH 06/17] media: atomisp: Remove watchdog timer Hans de Goede
2022-09-11 17:16 ` [PATCH 07/17] media: atomisp: Move atomisp_streaming_count() check into __atomisp_css_recover() Hans de Goede
2022-09-11 17:16 ` [PATCH 08/17] media: atomisp: Rework asd->streaming state update in __atomisp_streamoff() Hans de Goede
2022-09-11 17:16 ` Hans de Goede [this message]
2022-09-11 17:16 ` [PATCH 10/17] media: atomisp: Use video_dev.lock for ioctl locking Hans de Goede
2022-09-11 17:16 ` [PATCH 11/17] media: atomisp: Remove a couple of not useful function wrappers Hans de Goede
2022-09-11 17:16 ` [PATCH 12/17] media: atomisp: Drop unnecessary first_streamoff check Hans de Goede
2022-09-11 17:16 ` [PATCH 13/17] media: atomisp: Make atomisp_set_raw_buffer_bitmap() static Hans de Goede
2022-09-11 17:16 ` [PATCH 14/17] media: atomisp: Remove unused atomisp_css_get_dis_statistics() Hans de Goede
2022-09-11 17:16 ` [PATCH 15/17] media: atomisp: Remove const/fixed camera_caps Hans de Goede
2022-09-11 17:16 ` [PATCH 16/17] media: atomisp: Remove atomisp_source_pad_to_stream_id() Hans de Goede
2022-09-12 11:43 ` Andy Shevchenko
2022-09-21 9:11 ` Hans de Goede
2022-09-11 17:16 ` [PATCH 17/17] media: atomisp_gmin_platform: Unexport and split camera_sensor_csi() Hans de Goede
2022-09-12 11:44 ` [PATCH 00/17] media: atomisp: further cleanups / unwanted code removal Andy Shevchenko
2022-09-21 9:20 ` Hans de Goede
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=20220911171653.568932-10-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=andrey.i.trufanov@gmail.com \
--cc=andy@kernel.org \
--cc=fabioaiuto83@gmail.com \
--cc=kitakar@gmail.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=nable.maininbox@googlemail.com \
--cc=sakari.ailus@linux.intel.com \
--cc=yury.lunev@gmail.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).