From patchwork Sat Aug 15 10:37:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 11715773 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F326618 for ; Sat, 15 Aug 2020 22:02:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 528B2205CB for ; Sat, 15 Aug 2020 22:02:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728082AbgHOWB6 (ORCPT ); Sat, 15 Aug 2020 18:01:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728752AbgHOVvZ (ORCPT ); Sat, 15 Aug 2020 17:51:25 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CADE5C08E81F for ; Sat, 15 Aug 2020 03:37:56 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: dafna) with ESMTPSA id 6833828D80C From: Dafna Hirschfeld To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, dafna.hirschfeld@collabora.com, helen.koike@collabora.com, ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org, tfiga@chromium.org Subject: [PATCH v2 00/14] media: staging: rkisp1: various bug fixes Date: Sat, 15 Aug 2020 12:37:20 +0200 Message-Id: <20200815103734.31153-1-dafna.hirschfeld@collabora.com> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fix various bugs mainly in params and stats. The patchset fixes buffers synchronization issues discussed https://patchwork.kernel.org/patch/11066513/#23544763 As discussed with Tomasz, we decide that in order to keep the code simple, we assume that the v-start signal (RKISP1_CIF_ISP_V_START) and the frame-out signal RKISP1_CIF_ISP_FRAME don't arrive together. So when v-starts arrives the frame sequence is incremented and when frame-out arrives, the stats and params isr are called. Also the frame sequence of the params buffer should be the frame to which the params are applied. The params node needs to apply the first params buffer when the streaming from main/selfpath starts before the first frame arrive so that the first buffer will configure the first frame. The way it is implemented is that the first buffer queued to the params node is not added to the list but instead a local copy is saved and the buffer returns to userspace immediately. Then the local copy is applied when main/selfpath stream starts. This implementation is buggy for the following reasons: - The first params buffer is applied and returned to userspace even if userspace never calls to streamon on the params node. - If the first params buffer is queued after the stream started on the params node then it will return to userspace but will never be used. - The frame_sequence of the first buffer is set to -1 if the main/selfpath did not start streaming. To fix this, the buffers are added to the buffers list on qbuf and then when a stream start from selfpath/mainpath the first buffer is removed from the list, applied and returned to userspace. This is done only if the params node is also streaming. Testing: I added a code to libcamera that sets the red, blue, and green gain interchangeably. The frames are then saved to files. To run the code: git clone --single-branch --branch rkisp1-tests-for-params-fixes-patchset https://gitlab.collabora.com/dafna/libcamera.git cd libcamera ninja -C build install meson test rkisp1-ramzor -C build Then adding debug prints in the params node in the kernel that prints the gain values and the current frame http://ix.io/2ue3 Then playing frames with ffplay -f rawvideo -pixel_format nv12 -video_size 640x480 build/frame-bla-.bin and looking that the frame color matches the debug prints. changes from v1: - patch 1 from v1 is removed - patch 3 from v1 (now patch 5) which refactor the stop_streaming params cb is changed according to discussion with Tomasz - 12 new patches added Dafna Hirschfeld (14): media: staging: rkisp1: call params isr only upon frame out media: staging: rkisp1: params: use rkisp1_param_set_bits to set reg in isr media: staging: rkisp1: params: use the new effect value in cproc config media: staging: rkisp1: params: don't release lock in isr before buffer is done media: staging: rkisp1: params: upon stream stop, iterate a local list to return the buffers media: staging: rkisp1: params: in the isr, return if buffer list is empty media: staging: rkisp1: params: avoid using buffer if params is not streaming media: staging: rkisp1: params: set vb.sequence to be the isp's frame_sequence + 1 media: staging: rkisp1: remove atomic operations for frame sequence media: staging: rkisp1: isp: add a warning and debugfs var for irq delay media: staging: rkisp1: isp: don't enable signal RKISP1_CIF_ISP_FRAME_IN media: staging: rkisp1: stats: protect write to 'is_streaming' in start_streaming cb media: staging: rkisp1: call media_pipeline_start/stop from stats and params media: staging: rkisp1: params: no need to lock default config drivers/staging/media/rkisp1/rkisp1-capture.c | 2 +- drivers/staging/media/rkisp1/rkisp1-common.h | 10 +- drivers/staging/media/rkisp1/rkisp1-dev.c | 2 + drivers/staging/media/rkisp1/rkisp1-isp.c | 39 +++--- drivers/staging/media/rkisp1/rkisp1-params.c | 124 ++++++++---------- drivers/staging/media/rkisp1/rkisp1-stats.c | 14 +- 6 files changed, 96 insertions(+), 95 deletions(-)