From patchwork Mon May 13 17:21:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tretter X-Patchwork-Id: 10941401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C181214DB for ; Mon, 13 May 2019 17:21:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B54B628113 for ; Mon, 13 May 2019 17:21:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A989B2832B; Mon, 13 May 2019 17:21:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18F5C28113 for ; Mon, 13 May 2019 17:21:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731580AbfEMRVm (ORCPT ); Mon, 13 May 2019 13:21:42 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:57219 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731521AbfEMRVh (ORCPT ); Mon, 13 May 2019 13:21:37 -0400 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.lab.pengutronix.de) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hQEdq-0008VP-VY; Mon, 13 May 2019 19:21:34 +0200 Received: from mtr by dude02.lab.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1hQEdp-0003vb-9B; Mon, 13 May 2019 19:21:33 +0200 From: Michael Tretter To: linux-media@vger.kernel.org, devicetree@vger.kernel.org Cc: kernel@pengutronix.de, robh+dt@kernel.org, mchehab@kernel.org, tfiga@chromium.org, dshah@xilinx.com, hverkuil@xs4all.nl, Michael Tretter Subject: [PATCH v6 0/5] Add ZynqMP VCU/Allegro DVT H.264 encoder driver Date: Mon, 13 May 2019 19:21:26 +0200 Message-Id: <20190513172131.15048-1-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: mtr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is v6 of the Allegro DVT H.264 encoder driver found in the EV family of the Xilinx ZynqMP platform. Only minor changes this time. I dropped the implementation of the selection api, removed all references mentioning the decoder, and fixed a few issues reported by sparse and smatch. The v4l2-compliance result using the current vicodec branch is v4l2-compliance SHA: c2ad13e4b7aef9ae160303189c67a91e1775f025, 64 bits Compliance test for allegro device /dev/video4: Driver Info: Driver name : allegro Card type : Allegro DVT Video Encoder Bus info : platform:a0009000.video-codec Driver version : 5.1.0 Capabilities : 0x84208000 Video Memory-to-Memory Streaming Extended Pix Format Device Capabilities Device Caps : 0x04208000 Video Memory-to-Memory Streaming Extended Pix Format Detected Stateful Encoder Required ioctls: test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video4 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 10 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Test input 0: Streaming ioctls: test read/write: OK (Not Supported) test blocking wait: OK Video Capture: Captured 60 buffers test MMAP (select): OK Video Capture: Captured 60 buffers test MMAP (epoll): OK test USERPTR (select): OK (Not Supported) test DMABUF: Cannot test, specify --expbuf-device Total for allegro device /dev/video4: 49, Succeeded: 49, Failed: 0, Warnings: 0 I observed that the "MMAP (select)" test occasionally fails, because the test did not receive an V4L2_EVENT_EOS when dequeuing a buffer with V4L2_BUF_FLAG_LAST being set. The driver always queues the event before returning the last buffer and the "MMAP (epoll)" does not fail. Thus, I decided to send the series anyway. Michael v5 -> v6: - drop selection api and document visual size - drop references to the video decoder - fix sparse warnings regarding non-static functions - fix return type of rbsp_read_bit v4 -> v5: - add patch for allegro vendor prefix - move driver out of staging - implement draining with CMD_STOP and CMD_START - rewrite NAL unit RBSP generator v3 -> v4: - fix checkpatch and compiler warnings - use v4l2_m2m_buf_copy_metadata to copy buffer metadata - resolve FIXME regarding channel creation and streamon - resolve various TODOs - add mailbox format to firmware info - add suballocator_size to firmware info - use struct_size to allocate mcu_msg_push_buffers_internal - handle *_response messages in a union - cleanup mcu_send_msg functions - increase maximum video resolution to 4k - handle errors when creating a channel - do not update ctrls after channel is created - add documentation for nal_h264.h v2 -> v3: - add clocks to devicetree bindings - fix devicetree binding according to review comments on v2 - add missing v4l2 callbacks - drop unnecessary v4l2 callbacks - drop debug module parameter poison_capture_buffers - check firmware size before loading firmware - rework error handling v1 -> v2: - clean up debug log levels - fix unused variable in allegro_mbox_init - fix uninitialized variable in allegro_mbox_write - fix global module parameters - fix Kconfig dependencies - return h264 as default codec for mcu - implement device reset as documented - document why irq does not wait for clear - rename ENCODE_ONE_FRM to ENCODE_FRAME - allow error codes for mcu_channel_id - move control handler to channel - add fw version check - add support for colorspaces - enable configuration of H.264 levels - enable configuration of frame size - enable configuration of bit rate and CPB size - enable configuration of GOP size - rework response handling - fix missing error handling in allegro_h264_write_sps Hans Verkuil (1): videobuf2-v4l2: set last_buffer_dequeued in dqbuf Michael Tretter (4): media: dt-bindings: media: document allegro-dvt bindings media: dt-bindings: media: Add vendor prefix for allegro [media] allegro: add Allegro DVT video IP core driver [media] allegro: add SPS/PPS nal unit writer .../devicetree/bindings/media/allegro.txt | 43 + .../devicetree/bindings/vendor-prefixes.txt | 1 + MAINTAINERS | 7 + .../media/common/videobuf2/videobuf2-v4l2.c | 10 +- drivers/media/platform/Kconfig | 16 + drivers/media/platform/Makefile | 2 + drivers/media/platform/allegro-dvt/Makefile | 6 + .../media/platform/allegro-dvt/allegro-core.c | 3044 +++++++++++++++++ drivers/media/platform/allegro-dvt/nal-h264.c | 1001 ++++++ drivers/media/platform/allegro-dvt/nal-h264.h | 208 ++ 10 files changed, 4333 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/allegro.txt create mode 100644 drivers/media/platform/allegro-dvt/Makefile create mode 100644 drivers/media/platform/allegro-dvt/allegro-core.c create mode 100644 drivers/media/platform/allegro-dvt/nal-h264.c create mode 100644 drivers/media/platform/allegro-dvt/nal-h264.h