From patchwork Mon Nov 21 21:47:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13051664 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25EAFC433FE for ; Mon, 21 Nov 2022 21:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=85oqIdTROfwxBX1uonSSS+h5FxIrMV2SXvNlprkXVpw=; b=oq5dQYEGduh/4M x+S0FBRNrXQ+Oh7r8dd4SJQJCtY49jAhQSgFMLxS26WyayhovN3zHtkaU1oz5EWeoVFVMmFzYexHk OYrplv6zB6+5gFIpDsHquC86hoNddhjQ0DMBwqyHHcsvaa+0EaJLaTasScCx6KUe4FSTSFwXPwmfL 9Ecldg5mT/2CkuKqY4q+X6yy2KMb/5h2wyX9RJgmRdMQsnzMsAIdadRxGrbxQbGSySr6wBcoaQOkU vZuE2bL6tkptUoXG24l+9ht+ovTqkiiNUChUqeBOsgowhdAvBZBXbojlUp0SVVSmunuiuLUCMxgej vd9ynoVAaG3jBV8Di7fQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxEeX-000cSi-TW; Mon, 21 Nov 2022 21:48:34 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxEeU-000cND-28; Mon, 21 Nov 2022 21:48:31 +0000 Received: from umang.jainideasonboard.com (unknown [103.86.18.138]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6C7A874C; Mon, 21 Nov 2022 22:48:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1669067303; bh=Kf8EluE+fwGC8xwbosUvV+6ZUTupXQpqvZZJfMfS7d0=; h=From:To:Cc:Subject:Date:From; b=HsnS9bclZArwzfpxLL+o8KkAul0WxmhjXy6rfb9jfWCOuG0AgkBM9xqiPBWQ7+C0/ TM9+SHUe8S0YVt38onB4DplHnLtelhAfnqhoj6eCiIdKfSiCx3Laj2s13PoCMGAlUi lO1/bGpcYtT2Q4Lo1+BDqGnGqlghywdxXbs/e2JQ= From: Umang Jain To: linux-media@vger.kernel.org, kernel-list@raspberrypi.com, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev, Broadcom internal kernel review list Cc: Dave Stevenson , Florian Fainelli , Naushir Patuck , David Plowman , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH 00/14] staging: vc04_services: bcm2835-isp support Date: Tue, 22 Nov 2022 03:17:08 +0530 Message-Id: <20221121214722.22563-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_134830_296308_302CF2E1 X-CRM114-Status: GOOD ( 15.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This series aims to upport bcm2835-isp from the RPi kernel [1] and is a independent subset of earlier series [2] posted to upport CSI-2/CCP2 receiver IP core("Unicam) + the ISP driver found in BCM283x and compatible SoCs (namely BCM2711). Unicam is still under active development to work with multistream support to get into mainline. Hence only the ISP driver will remain the primary area of this series. Patch (01-02)/14 adds a new driver named vc-sm-cma to handle memory sharing with the VC4 VPU. Patch 03/14 adds a small extension to videobuf2 to allow exporting as a dma_buf instead of a file-descriptor. Patch (04-05)/14 adds a couple of improvements/support for bcm2835-isp(event callback and zero-copy) to vchiq-mmal. Patch (06-09)/14 adds the core bcm2835-isp driver along with headers and format defintions. Patch (10-11)/14 deals with the colorspace support. Note: This is still WIP since the implementation of colorspace is still getting ironed out (especially around setting of colorspace flags handling). Patch 12/14 allows multiple instances of the ISP. Patch 13/14 adds a admin-guide document on bcm2835-isp. Patch 14/14 wires all this up with the vchiq-mmal driver. Testing: Tested with RPi Model 4B running linux mainline v6.1-rc6. To test end-to-end, I choose to cherry-pick the Unicam patches and OV5647 DT bindings from [1]). Once done, functional testing was conducted with libcamera[3] and its utility tools. Also note: Reviews given on [2] for the relevant ISP driver patches have been incorporated in this version. Known issues: - Colorspace handling - vc-sm-cma spamming kernel log with - pr_err("%s: Expecting an uncached alias for dma_addr %pad\n" [1]: https://github.com/raspberrypi/linux [2]: https://lore.kernel.org/linux-media/20200504092611.9798-1-laurent.pinchart@ideasonboard.com/ [3]: https://libcamera.org/getting-started.html Dave Stevenson (7): staging: vc04_services: Add new vc-sm-cma driver staging: vchiq_arm: Register vcsm-cma as a platform driver media: videobuf2: Allow exporting of a struct dmabuf staging: mmal-vchiq: Add support for event callbacks staging: mmal-vchiq: Use vc-sm-cma to support zero copy staging: mmal_vchiq: Add image formats to be used by bcm2835-isp uapi: bcm2835-isp: Add bcm2835-isp uapi header file David Plowman (2): vc04_services: bcm2835-isp: Allow formats with different colour spaces vc04_services: bcm2835-isp: Permit all sRGB colour spaces on ISP outputs Naushir Patuck (5): media: uapi: v4l2-core: Add ISP statistics output V4L2 fourcc type staging: vc04_services: bcm2835-isp: Add a more complex ISP processing component staging: vc04_services: bcm2835_isp: Allow multiple users docs: admin-guide: media: bcm2835-isp: Add documentation for bcm2835-isp staging: vc04_services: vchiq: Load bcm2835_isp driver from vchiq .../admin-guide/media/bcm2835-isp.rst | 127 ++ .../userspace-api/media/drivers/index.rst | 1 + .../userspace-api/media/v4l/meta-formats.rst | 1 + .../v4l/pixfmt-meta-bcm2835-isp-stats.rst | 41 + MAINTAINERS | 9 + .../media/common/videobuf2/videobuf2-core.c | 36 +- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + drivers/staging/vc04_services/Kconfig | 4 + drivers/staging/vc04_services/Makefile | 2 + .../staging/vc04_services/bcm2835-isp/Kconfig | 14 + .../vc04_services/bcm2835-isp/Makefile | 8 + .../bcm2835-isp/bcm2835-isp-ctrls.h | 72 + .../bcm2835-isp/bcm2835-isp-fmts.h | 558 +++++ .../bcm2835-isp/bcm2835-v4l2-isp.c | 1817 +++++++++++++++++ .../interface/vchiq_arm/vchiq_arm.c | 6 + .../staging/vc04_services/vc-sm-cma/Kconfig | 10 + .../staging/vc04_services/vc-sm-cma/Makefile | 12 + .../staging/vc04_services/vc-sm-cma/vc_sm.c | 801 ++++++++ .../staging/vc04_services/vc-sm-cma/vc_sm.h | 54 + .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.c | 507 +++++ .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.h | 63 + .../vc04_services/vc-sm-cma/vc_sm_defs.h | 187 ++ .../vc04_services/vc-sm-cma/vc_sm_knl.h | 28 + .../staging/vc04_services/vchiq-mmal/Kconfig | 1 + .../vc04_services/vchiq-mmal/mmal-common.h | 5 + .../vc04_services/vchiq-mmal/mmal-encodings.h | 66 + .../vc04_services/vchiq-mmal/mmal-msg.h | 35 + .../vchiq-mmal/mmal-parameters.h | 165 +- .../vc04_services/vchiq-mmal/mmal-vchiq.c | 253 ++- .../vc04_services/vchiq-mmal/mmal-vchiq.h | 5 + include/media/videobuf2-core.h | 15 + include/uapi/linux/bcm2835-isp.h | 347 ++++ include/uapi/linux/v4l2-controls.h | 6 + include/uapi/linux/videodev2.h | 1 + 34 files changed, 5225 insertions(+), 33 deletions(-) create mode 100644 Documentation/admin-guide/media/bcm2835-isp.rst create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst create mode 100644 drivers/staging/vc04_services/bcm2835-isp/Kconfig create mode 100644 drivers/staging/vc04_services/bcm2835-isp/Makefile create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Kconfig create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Makefile create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.c create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.h create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h create mode 100644 include/uapi/linux/bcm2835-isp.h