From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAAE953E318 for ; Tue, 22 Sep 2026 12:05:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790078754; cv=none; b=WNIpU6/SwMa0au8VF7EwTPnW8BObxnfwt7a3kM/AmpCbkg2htAioRI2o+jPhKLeVI2b3hpsNJWlJ5tmAyniNFigIjoMX8CMK2atPsOM/Wl/WGiuQ89jOG8ZinTeTn8/gUNo8BwdkDy8X0tKLKni2B9lb7oYWXsJeDrKWbLrVumg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790078754; c=relaxed/simple; bh=UNwXlS07CkTZ7JCHuhRZ+xohgRXy5+/x8HDvgJNAQiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j1IKOOS6booZWHra8NOS5Rw1tAaoqc1uEY30gsVdWo7SInb//VCNfnJGrwBHVBhhriuOAFZQR0lNV+lmt48EjrE4NCkLkpPNhDubGgt7tlcRvnOPJYNiAPQ2XEroLCRyHK9HQ9yRgzwsMPKU9nAnCm+L8pAaS1kt2K6d+huVnAM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fr0++7JO; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fr0++7JO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790078753; x=1821614753; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UNwXlS07CkTZ7JCHuhRZ+xohgRXy5+/x8HDvgJNAQiQ=; b=fr0++7JOg3o/6kQjGdQx1ooPSzPm14B4dAyvLvDU4D7pHC6OkJGvbNFv ExsalntzTdvk6lWLEgQ3fOEm9hukh35PWKt4gcltEW/FvaE43Uez0+DpT njYA6/jvVkIi1rG7tnW6MQfnvOY1G3sGEggfoHvU8C00SmDMwmnlaBBbO 9GB/kAnC7kQN8B5yR+mWMcZrWHBMKxT9yaPd8JZRcBfPJ0x18I410KREu J1+K9LQwdECBVKTOPmh3EeDkNUZE3lCs1KlHoHTbUbc0BmfAuzdNg5427 tDrMcbvRYpPoxBoUJjyi8zDjQiBOQXvVMwNEaZHa4mfBdpZOPh0ojksCQ g==; X-CSE-ConnectionGUID: 0cvHWewyTb+y2jI3x+sp3g== X-CSE-MsgGUID: /DH1K0xkSAKk/nTfXJYn8g== X-IronPort-AV: E=McAfee;i="6800,10657,11912"; a="78227100" X-IronPort-AV: E=Sophos;i="6.27,116,1787036400"; d="scan'208";a="78227100" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2026 05:05:47 -0700 X-CSE-ConnectionGUID: Ndb1K9qoROur5Eg9O9I8gw== X-CSE-MsgGUID: 3hjD2UOuSG6WqX09BDOqPA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,116,1787036400"; d="scan'208";a="301029165" Received: from carterle-desk.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.245.41]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2026 05:05:45 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id B19C0121CBD; Tue, 22 Sep 2026 15:05:40 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1x8zFi-00000003lI4-3gqk; Tue, 22 Sep 2026 15:05:38 +0300 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: "Yan, Dongcheng" , Mehdi Djait , "Yu, Ong Hock" , "Ng, Khai Wen" , Antti Laakso , "Bajpai, Manik" , Divyamani Tripathi , Nicola Fiorillo Subject: [PATCH v3 09/21] media: ipu6: Start streaming once all streams have started, stop when not Date: Tue, 22 Sep 2026 15:05:26 +0300 Message-ID: <20260922120538.896684-10-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260922120538.896684-1-sakari.ailus@linux.intel.com> References: <20260922120538.896684-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit For each virtual channel, start streaming once all buffer queues connected via enabled routes have been set streaming, similarly stop when the first queue is stopped. Signed-off-by: Sakari Ailus --- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 109 +++++++++++++++++- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 1 + .../media/pci/intel/ipu6/ipu6-isys-queue.c | 7 +- 3 files changed, 107 insertions(+), 10 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c index f92577054d89..e2d367b38d4b 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -435,6 +436,88 @@ static int ipu7_isys_csi2_stream_enable(struct ipu6_isys_csi2 *csi2) return 0; } +static int ipu6_isys_csi2_streaming_change(struct ipu6_isys_subdev *asd, + struct v4l2_subdev_state *state, + u32 pad, u8 *vc, bool enable) +{ + struct v4l2_mbus_frame_desc_entry *this_entry = NULL; + struct v4l2_subdev_route *route, *this_route = NULL; + u32 streams_enabled = 0, nodes_streaming = 0; + struct v4l2_mbus_frame_desc desc = { 0 }; + int ret; + + for_each_active_route(&state->routing, this_route) + if (pad == this_route->source_pad) + break; + if (!this_route) { + dev_dbg(asd->sd.dev, "no route found for pad %u\n", pad); + return -EINVAL; + } + + struct media_pad *remote_pad = + media_pad_remote_pad_first(&asd->sd.entity.pads[this_route->sink_pad]); + struct v4l2_subdev *remote_sd = + media_entity_to_v4l2_subdev(remote_pad->entity); + ret = v4l2_subdev_call(remote_sd, pad, get_frame_desc, + remote_pad->index, &desc); + if (ret) + return ret; + + for (unsigned int i = 0; i < desc.num_entries; i++) { + if (desc.entry[i].stream == this_route->sink_stream) { + this_entry = &desc.entry[i]; + break; + } + } + if (!this_entry) { + dev_dbg(asd->sd.dev, + "no frame descriptor entry found for stream %u\n", + this_route->sink_stream); + return -EINVAL; + } + + for_each_active_route(&state->routing, route) { + struct v4l2_mbus_frame_desc_entry *entry = NULL; + + for (unsigned int i = 0; i < desc.num_entries; i++) { + if (desc.entry[i].stream == route->sink_stream) { + entry = &desc.entry[i]; + break; + } + } + + if (!entry) { + dev_dbg(asd->sd.dev, "cannot find stream %u from frame descriptor\n", + route->sink_stream); + return -EINVAL; + } + + if (entry->bus.csi2.vc != this_entry->bus.csi2.vc) + continue; + + struct media_pad *video_pad = + media_pad_remote_pad_first(&asd->sd.entity.pads[route->source_pad]); + struct ipu6_isys_video *av = + container_of_const(video_pad, struct ipu6_isys_video, + pad); + + streams_enabled++; + if (av->streaming || (enable && pad == route->source_pad)) + nodes_streaming++; + } + + *vc = this_entry->bus.csi2.vc; + + if (streams_enabled == nodes_streaming) { + dev_dbg(asd->sd.dev, + "changing streaming state to %s on \"%s\":%u\n", + str_enabled_disabled(enable), asd->sd.entity.name, pad); + return 1; + } + + return 0; +} + static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, u32 pad, u64 streams_mask) @@ -450,6 +533,7 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd, struct ipu6_isys_buffer_list bl; u64 sink_streams; int ret; + u8 vc; ret = ipu6_isys_buffer_list_get(av->stream, &bl); if (ret < 0) { @@ -459,6 +543,10 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd, list_add(&av->csi2_entry, &csi2->av_head); + ret = ipu6_isys_csi2_streaming_change(asd, state, pad, &vc, true); + if (ret <= 0) + return ret; + ret = ipu6_isys_start_stream_firmware(av, &bl); if (ret) { dev_err(sd->dev, "start stream of firmware failed\n"); @@ -472,16 +560,20 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd, v4l2_subdev_state_xlate_streams(state, pad, CSI2_PAD_SINK, &streams_mask); - ret = IS_IPU7(isp) ? ipu7_isys_csi2_stream_enable(csi2) : - ipu6_isys_csi2_stream_enable(csi2); - if (ret) - goto err_stop_stream_firmware; + if (!csi2->streaming_vc) { + ret = IS_IPU7(isp) ? ipu7_isys_csi2_stream_enable(csi2) : + ipu6_isys_csi2_stream_enable(csi2); + if (ret) + goto err_stop_stream_firmware; + } ret = v4l2_subdev_enable_streams(remote_sd, remote_pad->index, sink_streams); if (ret) goto err_stop_stream_csi2; + csi2->streaming_vc |= BIT(vc); + return 0; err_stop_stream_csi2: @@ -514,6 +606,14 @@ static int ipu6_isys_csi2_disable_streams(struct v4l2_subdev *sd, struct ipu6_device *isp = asd->isys->adev->isp; struct v4l2_subdev *remote_sd; u64 sink_streams; + int ret; + u8 vc; + + ret = ipu6_isys_csi2_streaming_change(asd, state, pad, &vc, false); + if (ret <= 0) + goto out_del_csi2_entry; + + csi2->streaming_vc &= ~BIT(vc); sink_streams = v4l2_subdev_state_xlate_streams(state, pad, CSI2_PAD_SINK, @@ -533,6 +633,7 @@ static int ipu6_isys_csi2_disable_streams(struct v4l2_subdev *sd, ipu6_isys_close_streaming_firmware(av); +out_del_csi2_entry: list_del(&av->csi2_entry); return 0; diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h index 7c936154691e..a98a60e443c6 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h @@ -49,6 +49,7 @@ struct ipu6_isys_csi2 { unsigned int port; u32 legacy_irq_mask; unsigned int phy_mode; + u32 streaming_vc; }; struct ipu6_isys_csi2_timing { diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c index 35cfd7a10882..f70c6f926229 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c @@ -533,14 +533,10 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) ipu6_isys_configure_stream_watermark(av, source_pad->entity); ipu6_isys_update_stream_watermark(av, true); - if (stream->nr_streaming != stream->nr_queues) - goto out; - ret = ipu6_isys_stream_start(av); if (ret) goto out_stream_start; -out: mutex_unlock(&stream->mutex); return 0; @@ -574,8 +570,7 @@ static void stop_streaming(struct vb2_queue *q) ipu6_isys_update_stream_watermark(av, false); mutex_lock(&av->isys->stream_mutex); - if (stream->nr_streaming == stream->nr_queues) - ipu6_isys_video_set_streaming(av, 0); + ipu6_isys_video_set_streaming(av, 0); list_del(&aq->node); mutex_unlock(&av->isys->stream_mutex); -- 2.47.3