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 AAB7E53F681 for ; Tue, 22 Sep 2026 12:05:54 +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=1790078756; cv=none; b=uFbWq1skfVipmYL7U2QGgXxDb+2Z6M1S0DtCUnvq5KSz2WPUGpGehVW6vMGvG3wJgSaeE9/GLwqlLo5LKfHnlh7O7uvdUH2zjmduourEli5jh6msQFE9YA1ROMQxFglUrL3L3Dk4uu4Jk3USP1Kc/BllpznyO/3rZefxMfucsJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790078756; c=relaxed/simple; bh=gd0HOhEJeOy2oTd+/g9nDRuYgDjPYV4kOd44Zn6a8GQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nkGJpDh/prjxPZoQF4Ts85P5AWhuiwQ7NBljMLvVhTjbAqpsbmih0FHF2a/yMyd4W3BD2xQHxOVOqESzeSh3c0195zLV6VXRBSbdhWi3b/ASSqwY87zUfy8sSWlIbOrKiFGAFEak9NPs4YIluBWrARyGyv+ptwepdiOMbn8lw7E= 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=P68XTtMf; 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="P68XTtMf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790078755; x=1821614755; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gd0HOhEJeOy2oTd+/g9nDRuYgDjPYV4kOd44Zn6a8GQ=; b=P68XTtMfqMAkf2BLe2w9HeG9rDjhqc3URp9+zw2nHmiIxdCLHESi/Tyb g/mp8EqhUGJLExgc3KjabWm5Bfl6BKxMT/TQKyiUrVBu7eNOqKER14+qD NIO7sYWFXI8cjrIhUc/LYwAAsUCpHPt51xZKqdxxYdk7DYsO3r8SV2tXo VfrYHuDAmnaNViClcPOAKDQ8nndAOVgWc8fb1P5b1ezbROKzcfrSy6Zwi euyisFRShjY8pCxDv0hSflyBnnWvkwW5fTys586BDMNg3oxUtSE+33RCS sR/hnHaZh/9zN/77UkjmwkFVgi+MyN1bLcDQxRVdKyur3hdg8KcjKbyF0 A==; X-CSE-ConnectionGUID: E1eDX4acRJ2Wrz94JZTk2g== X-CSE-MsgGUID: JuJto6C+TsCjHEBW3ZKXtw== X-IronPort-AV: E=McAfee;i="6800,10657,11912"; a="78227107" X-IronPort-AV: E=Sophos;i="6.27,116,1787036400"; d="scan'208";a="78227107" 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:48 -0700 X-CSE-ConnectionGUID: vts79A7LTEumXqMFmKjPMw== X-CSE-MsgGUID: WCEQPLC2RUOj74T+/vWi5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,116,1787036400"; d="scan'208";a="301029172" 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 B7F1B121D12; 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-00000003lIC-3nDR; 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 11/21] media: ipu6: Remove nr_queues and nr_streaming fields in ipu6_isys_stream Date: Tue, 22 Sep 2026 15:05:28 +0300 Message-ID: <20260922120538.896684-12-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 nr_queues and nr_streaming fields were being used to determine whether streaming was to be started in the upstream sub-device. As we store the streaming state in the CSI-2 sub-device, there's no longer need for that. Drop these fields. Signed-off-by: Sakari Ailus --- .../media/pci/intel/ipu6/ipu6-isys-queue.c | 24 +++++++++---------- .../media/pci/intel/ipu6/ipu6-isys-video.c | 20 +++++----------- .../media/pci/intel/ipu6/ipu6-isys-video.h | 7 ++---- 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c index f70c6f926229..b4c3de959f81 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c @@ -250,6 +250,9 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av) if (ret) return ret; + if (!(BIT(stream->vc) & av->csi2->streaming_vc)) + return 0; + do { ret = ipu6_isys_buffer_list_get(stream, &bl); if (ret < 0) @@ -294,6 +297,7 @@ static void buf_queue(struct vb2_buffer *vb) struct ipu6_isys_buffer *ib = &ivb->ib; struct device *dev = &adev->auxdev.dev; struct ipu6_isys_stream *stream = av->stream; + struct ipu6_isys_csi2 *csi2; struct ipu6_isys_buffer_list bl; struct isys_fw_msgs *msg; unsigned long flags; @@ -317,7 +321,8 @@ static void buf_queue(struct vb2_buffer *vb) mutex_lock(&stream->mutex); - if (stream->nr_streaming != stream->nr_queues) { + csi2 = ipu6_isys_subdev_to_csi2(stream->asd); + if (!(BIT(stream->vc) & csi2->streaming_vc)) { dev_dbg(dev, "not streaming yet, adding to incoming\n"); goto out; } @@ -478,7 +483,8 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0); struct ipu6_isys_stream *stream; struct media_pad *source_pad, *remote_pad; - int nr_queues, ret; + bool first; + int ret; dev_dbg(dev, "stream: %s: width %u, height %u, css pixelformat %u\n", av->vdev.name, ipu6_isys_get_frame_width(av), @@ -498,11 +504,12 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) goto out_return_buffers; } - ret = ipu6_isys_setup_video(av, remote_pad, source_pad, &nr_queues); + ret = ipu6_isys_setup_video(av, remote_pad, source_pad); if (ret < 0) { dev_dbg(dev, "failed to setup video\n"); goto out_return_buffers; } + first = ret; ret = ipu6_isys_link_fmt_validate(aq); if (ret) { @@ -518,17 +525,12 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) stream = av->stream; mutex_lock(&stream->mutex); - if (!stream->nr_streaming) { - ret = ipu6_isys_video_prepare_stream(av, source_pad->entity, - nr_queues); + if (first) { + ret = ipu6_isys_video_prepare_stream(av, source_pad->entity); if (ret) goto out_fw_close; } - stream->nr_streaming++; - dev_dbg(dev, "queue %u of %u\n", stream->nr_streaming, - stream->nr_queues); - list_add(&aq->node, &stream->queues); ipu6_isys_configure_stream_watermark(av, source_pad->entity); ipu6_isys_update_stream_watermark(av, true); @@ -544,7 +546,6 @@ static int start_streaming(struct vb2_queue *q, unsigned int count) out_stream_start: ipu6_isys_update_stream_watermark(av, false); list_del(&aq->node); - stream->nr_streaming--; out_fw_close: mutex_unlock(&stream->mutex); @@ -574,7 +575,6 @@ static void stop_streaming(struct vb2_queue *q) list_del(&aq->node); mutex_unlock(&av->isys->stream_mutex); - stream->nr_streaming--; mutex_unlock(&stream->mutex); ipu6_isys_stream_cleanup(av); diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c index b3cbd4266da1..5c00c98869d9 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c @@ -611,16 +611,11 @@ void ipu6_isys_close_streaming_firmware(struct ipu6_isys_video *av) } int ipu6_isys_video_prepare_stream(struct ipu6_isys_video *av, - struct media_entity *source_entity, - int nr_queues) + struct media_entity *source_entity) { struct ipu6_isys_stream *stream = av->stream; struct ipu6_isys_csi2 *csi2; - if (WARN_ON(stream->nr_streaming)) - return -EINVAL; - - stream->nr_queues = nr_queues; atomic_set(&stream->sequence, 0); atomic_set(&stream->buf_id, 0); @@ -1000,7 +995,7 @@ void ipu6_isys_fw_close(struct ipu6_isys *isys) int ipu6_isys_setup_video(struct ipu6_isys_video *av, struct media_pad *remote_pad, - struct media_pad *source_pad, int *nr_queues) + struct media_pad *source_pad) { const struct ipu6_isys_pixelformat *pfmt = ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0); @@ -1012,18 +1007,14 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, struct v4l2_subdev *remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity); struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(remote_sd); + struct media_pipeline *pipeline; int ret = -EINVAL; - *nr_queues = 0; - /* Find the root */ state = v4l2_subdev_lock_and_get_active_state(remote_sd); - for_each_active_route(&state->routing, r) { - (*nr_queues)++; - + for_each_active_route(&state->routing, r) if (r->source_pad == remote_pad->index) route = r; - } if (!route) { v4l2_subdev_unlock_state(state); @@ -1051,6 +1042,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, return ret; } + pipeline = video_device_pipeline(&av->vdev); ret = video_device_pipeline_alloc_start(&av->vdev); if (ret < 0) { dev_dbg(dev, "media pipeline start failed\n"); @@ -1064,7 +1056,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, return -EINVAL; } - return 0; + return !pipeline; } /* diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h index cb4b45f0dae2..a78aaad63303 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.h +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.h @@ -52,8 +52,6 @@ struct ipu6_isys_stream { unsigned int nr_output_pins; struct ipu6_isys_subdev *asd; - int nr_queues; /* Number of capture queues */ - int nr_streaming; struct list_head queues; struct completion stream_open_completion; struct completion stream_close_completion; @@ -108,14 +106,13 @@ int ipu6_isys_start_stream_firmware(struct ipu6_isys_video *av, void ipu6_isys_stop_streaming_firmware(struct ipu6_isys_video *av); void ipu6_isys_close_streaming_firmware(struct ipu6_isys_video *av); int ipu6_isys_video_prepare_stream(struct ipu6_isys_video *av, - struct media_entity *source_entity, - int nr_queues); + struct media_entity *source_entity); int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state); int ipu6_isys_fw_open(struct ipu6_isys *isys); void ipu6_isys_fw_close(struct ipu6_isys *isys); int ipu6_isys_setup_video(struct ipu6_isys_video *av, struct media_pad *remote_pad, - struct media_pad *source_pad, int *nr_queues); + struct media_pad *source_pad); int ipu6_isys_video_init(struct ipu6_isys_video *av); void ipu6_isys_video_cleanup(struct ipu6_isys_video *av); void ipu6_isys_put_stream(struct ipu6_isys_stream *stream); -- 2.47.3