[0/3] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices
Message ID | 20200313014626.3103091-1-helen.koike@collabora.com (mailing list archive) |
---|---|
Headers |
Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from <linux-media-owner@vger.kernel.org>) id 1jCZNg-00CfNq-HG; Fri, 13 Mar 2020 01:44:56 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726254AbgCMBqn (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Thu, 12 Mar 2020 21:46:43 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:48512 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726114AbgCMBqm (ORCPT <rfc822;linux-media@vger.kernel.org>); Thu, 12 Mar 2020 21:46:42 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id A489728DA67 From: Helen Koike <helen.koike@collabora.com> To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, linux-kernel@vger.kernel.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, hans.verkuil@cisco.com, kernel@collabora.com, Helen Koike <helen.koike@collabora.com> Subject: [PATCH 0/3] media: staging: rkisp1: allow simultaneous streaming from multiple capture devices Date: Thu, 12 Mar 2020 22:46:23 -0300 Message-Id: <20200313014626.3103091-1-helen.koike@collabora.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Message
Helen Koike
March 13, 2020, 1:46 a.m. UTC
Hi, This series adds support for simultaneous streaming from both capture devices (rkisp1_selfpath and rkisp1_mainpath). Patch 1/3 fixes return error handling from pm functions, which was preventing the second stream to start. Patch 2/3 don't allow .s_stream entity callback to be called if a stream is already enabled. Which fixes the issue when stopping one stream would also stop the other. Patch 3/3 serializes start/stop streaming calls, since they both read and modify the streaming status of all the entities in the piipeline. This series was tested with: SEN_DEV=/dev/v4l-subdev3 ISP_DEV=/dev/v4l-subdev0 RSZ_SP_DEV=/dev/v4l-subdev2 RSZ_MP_DEV=/dev/v4l-subdev1 CAP_SP_DEV=/dev/video1 CAP_MP_DEV=/dev/video0 WIDTH=1920 HEIGHT=1080 RAW_CODE=SRGGB10_1X10 YUV_CODE=YUYV8_2X8 v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$RAW_CODE -d $SEN_DEV v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$RAW_CODE -d $ISP_DEV v4l2-ctl --set-subdev-selection pad=0,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $ISP_DEV v4l2-ctl --set-subdev-selection pad=2,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $ISP_DEV v4l2-ctl --set-subdev-fmt pad=2,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $ISP_DEV v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_SP_DEV v4l2-ctl --set-subdev-fmt pad=1,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_SP_DEV v4l2-ctl --set-subdev-selection pad=0,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $RSZ_SP_DEV v4l2-ctl --set-subdev-fmt pad=0,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_MP_DEV v4l2-ctl --set-subdev-fmt pad=1,width=$WIDTH,height=$HEIGHT,code=$YUV_CODE -d $RSZ_MP_DEV v4l2-ctl --set-subdev-selection pad=0,target=crop,top=0,left=0,width=$WIDTH,height=$HEIGHT -d $RSZ_MP_DEV v4l2-ctl -v width=$WIDTH,height=$HEIGHT,pixelformat=NV12 -d $CAP_SP_DEV v4l2-ctl -v width=$WIDTH,height=$HEIGHT,pixelformat=NV12 -d $CAP_MP_DEV sleep 1 v4l2-ctl --stream-mmap --stream-count=100 -d $CAP_SP_DEV --stream-to=/tmp/test_sp.raw & v4l2-ctl --stream-mmap --stream-count=100 -d $CAP_MP_DEV --stream-to=/tmp/test_mp.raw & wait echo "Completed" Helen Koike (3): media: staging: rkisp1: cap: fix return values from pm functions media: staging: rkisp1: do not call s_stream if the entity is still in use media: staging: rkisp1: cap: serialize start/stop stream drivers/staging/media/rkisp1/rkisp1-capture.c | 25 ++++++++++++++++--- drivers/staging/media/rkisp1/rkisp1-common.h | 2 ++ drivers/staging/media/rkisp1/rkisp1-dev.c | 2 ++ 3 files changed, 25 insertions(+), 4 deletions(-)