Linux-Media Archive on lore.kernel.org
 help / color / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: Benoit Parrot <bparrot@ti.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Pratyush Yadav <p.yadav@ti.com>,
	Lokesh Vutla <lokeshvutla@ti.com>,
	linux-media@vger.kernel.org
Cc: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Subject: [PATCH v2 34/35] media: ti-vpe: cal: add camerarx enable/disable refcounting
Date: Tue, 20 Apr 2021 15:04:32 +0300
Message-ID: <20210420120433.902394-35-tomi.valkeinen@ideasonboard.com> (raw)
In-Reply-To: <20210420120433.902394-1-tomi.valkeinen@ideasonboard.com>

The following patches add multistream support and we will have multiple
video devices using the same camerarx instances. Thus we need
enable/disable refcounting for the camerarx.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 drivers/media/platform/ti-vpe/cal-camerarx.c | 10 ++++++++++
 drivers/media/platform/ti-vpe/cal.h          |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti-vpe/cal-camerarx.c
index 6f3d44d529b0..885946ae1140 100644
--- a/drivers/media/platform/ti-vpe/cal-camerarx.c
+++ b/drivers/media/platform/ti-vpe/cal-camerarx.c
@@ -285,6 +285,11 @@ static int cal_camerarx_start(struct cal_camerarx *phy)
 	u32 val;
 	int ret;
 
+	if (phy->enable_count > 0) {
+		phy->enable_count++;
+		return 0;
+	}
+
 	link_freq = cal_camerarx_get_ext_link_freq(phy);
 	if (link_freq < 0)
 		return link_freq;
@@ -409,6 +414,8 @@ static int cal_camerarx_start(struct cal_camerarx *phy)
 	/* Finally, enable the PHY Protocol Interface (PPI). */
 	cal_camerarx_ppi_enable(phy);
 
+	phy->enable_count++;
+
 	return 0;
 }
 
@@ -416,6 +423,9 @@ static void cal_camerarx_stop(struct cal_camerarx *phy)
 {
 	int ret;
 
+	if (--phy->enable_count > 0)
+		return;
+
 	cal_camerarx_ppi_disable(phy);
 
 	cal_camerarx_disable_irqs(phy);
diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
index 78bd2e041d9a..8608a2c6c01a 100644
--- a/drivers/media/platform/ti-vpe/cal.h
+++ b/drivers/media/platform/ti-vpe/cal.h
@@ -166,6 +166,8 @@ struct cal_camerarx {
 
 	/* mutex for camerarx ops */
 	struct mutex		mutex;
+
+	unsigned int enable_count;
 };
 
 struct cal_dev {
-- 
2.25.1


  parent reply index

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-20 12:03 [PATCH v2 00/35] media: ti-vpe: cal: prepare for multistream support Tomi Valkeinen
2021-04-20 12:03 ` [PATCH v2 01/35] media: ti-vpe: cal: add g/s_parm for legacy API Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 02/35] media: ti-vpe: cal: fix error handling in cal_camerarx_create Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 03/35] media: ti-vpe: cal: remove unused cal_camerarx->dev field Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 04/35] media: ti-vpe: cal: rename "sensor" to "source" Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 05/35] media: ti-vpe: cal: move global config from cal_ctx_wr_dma_config to runtime resume Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 06/35] media: ti-vpe: cal: use v4l2_get_link_freq Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 07/35] media: ti-vpe: cal: add cal_ctx_prepare/unprepare Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 08/35] media: ti-vpe: cal: change index and cport to u8 Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 09/35] media: ti-vpe: cal: Add CSI2 context Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 10/35] media: ti-vpe: cal: Add pixel processing context Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 11/35] media: ti-vpe: cal: rename cal_ctx->index to dma_ctx Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 12/35] media: ti-vpe: cal: rename CAL_HL_IRQ_MASK Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 13/35] media: ti-vpe: cal: clean up CAL_CSI2_VC_IRQ_* macros Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 14/35] media: ti-vpe: cal: catch VC errors Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 15/35] media: ti-vpe: cal: remove wait when stopping camerarx Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 16/35] media: ti-vpe: cal: disable csi2 ctx and pix proc at ctx_stop Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 17/35] media: ti-vpe: cal: allocate pix proc dynamically Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 18/35] media: ti-vpe: cal: add 'use_pix_proc' field Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 19/35] media: ti-vpe: cal: add cal_ctx_wr_dma_enable and fix a race Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 20/35] media: ti-vpe: cal: add vc and datatype fields to cal_ctx Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 21/35] media: ti-vpe: cal: handle cal_ctx_v4l2_register error Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 22/35] media: ti-vpe: cal: set field always to V4L2_FIELD_NONE Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 23/35] media: ti-vpe: cal: fix typo in a comment Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 24/35] media: ti-vpe: cal: add mbus_code support to cal_mc_enum_fmt_vid_cap Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 25/35] media: ti-vpe: cal: rename non-MC funcs to cal_legacy_* Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 26/35] media: ti-vpe: cal: init ctx->v_fmt correctly in MC mode Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 27/35] media: ti-vpe: cal: remove cal_camerarx->fmtinfo Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 28/35] media: ti-vpe: cal: support 8 DMA contexts Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 29/35] media: ti-vpe: cal: cleanup phy iteration in cal_remove Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 30/35] media: ti-vpe: cal: fix ctx uninitialization Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 31/35] media: ti-vpe: cal: fix queuing of the initial buffer Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 32/35] media: ti-vpe: cal: use CSI-2 frame number Tomi Valkeinen
2021-04-20 12:04 ` [PATCH v2 33/35] media: ti-vpe: cal: add camerarx locking Tomi Valkeinen
2021-04-20 12:04 ` Tomi Valkeinen [this message]
2021-04-20 12:04 ` [PATCH v2 35/35] media: ti-vpe: cal: allow more than 1 source pads Tomi Valkeinen

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=20210420120433.902394-35-tomi.valkeinen@ideasonboard.com \
    --to=tomi.valkeinen@ideasonboard.com \
    --cc=bparrot@ti.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=lokeshvutla@ti.com \
    --cc=p.yadav@ti.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

Linux-Media Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-media/0 linux-media/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-media linux-media/ https://lore.kernel.org/linux-media \
		linux-media@vger.kernel.org
	public-inbox-index linux-media

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-media


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git