From patchwork Tue Nov 17 08:44:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 11911741 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEA1AC64E7A for ; Tue, 17 Nov 2020 08:45:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D0C024655 for ; Tue, 17 Nov 2020 08:45:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="Cfddq0k0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbgKQIor (ORCPT ); Tue, 17 Nov 2020 03:44:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726875AbgKQIoq (ORCPT ); Tue, 17 Nov 2020 03:44:46 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 644B8C0613CF for ; Tue, 17 Nov 2020 00:44:46 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id h21so2432860wmb.2 for ; Tue, 17 Nov 2020 00:44:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pH6zvjjB0a/kJ5cI0/jHVZAZo1qnyBd3cBucYO1B9Qo=; b=Cfddq0k0vGPYOaDff75I+h0SRWHxWmmUi1sHrhi62AzhwM2u7hqxuHZhGxW1jt3ugL rYICydedp3/3MbBblupyM/ZkAyGHViNmjpXBkdO2kokFoixTUAmWnB3PzgmuKlEEVm7V SpfI8Itzxs3/oiNyyKUtITyFYlprhNRgDb6cpuAvP6pS3Wkn8haneKFt08YUqNfoa0Kc 9MJxDcOE7/bx33FQieJD35qD+/6WP05IFJcPjGJcn0Tg2YBIgY/1/dh4w6FgFQPKRePN HOXYpjtQW9mGlqBX9ttUrdsKk4IIb4dsKnx/oGRIlI56+DVjB+zIHWK/A8RGmFPR4KM3 4B6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pH6zvjjB0a/kJ5cI0/jHVZAZo1qnyBd3cBucYO1B9Qo=; b=lIUmp/8JJQryakujVVOtXjuMbOfnVNVQnj363j9IEnrldN2q+FwBPlWyC9v1+xeE+B nnx12g7BXe0cfIYzmc0Pf9VxYzyZn8GRfGZxjMsA09WFn+SGmGt0XAvwjq34dnmQpvRR mVJxFw4wDebF+Zss7eYLPHW4OCQxQLd/bM19/2DoWcL+QUtSjvpkvShf/HrIkTSy03wL Uh3NQg/3SDTb8yLnEHybBv1HGi5UTDF7yLu2Hdccuq98BYgmzBq7gtJzrWQOpHASzSNn tAlxJ9M4YzCD26EcXIH39O26kI2TXqGRNw2GmS65m7WhjMqcK6RJN8Mz0wdmM9/ECfdu I0lA== X-Gm-Message-State: AOAM532kmsORjF3Ij+dJjC5K+HRPy7vxWJyPU31MF+1t8fNu/vMjb1cu SBinClWJybVVAtAjmmgALUrU7w== X-Google-Smtp-Source: ABdhPJx/pH5ybXz9fE8uwmpk+mYx/+De27sIQYj+cH7VDSMcs7ZK+HtgcIkjc+pefCitmUH3g26UWQ== X-Received: by 2002:a7b:c458:: with SMTP id l24mr2967179wmi.136.1605602684929; Tue, 17 Nov 2020 00:44:44 -0800 (PST) Received: from localhost.localdomain ([2a01:e35:2ec0:82b0:1561:9f4b:5829:8e26]) by smtp.gmail.com with ESMTPSA id s4sm25631423wro.10.2020.11.17.00.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 00:44:44 -0800 (PST) From: Neil Armstrong To: hverkuil@xs4all.nl Cc: Neil Armstrong , linux-media@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 0/4] media: meson: Add support for the Amlogic GE2D Accelerator Unit Date: Tue, 17 Nov 2020 09:44:36 +0100 Message-Id: <20201117084440.578540-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The GE2D is a 2D accelerator with various features like configurable blitter with alpha blending, frame rotation, scaling, format conversion and colorspace conversion. The driver implements a Memory2Memory VB2 V4L2 streaming device permitting: - 0, 90, 180, 270deg rotation - horizontal/vertical flipping - source cropping - destination compositing - 32bit/24bit/16bit format conversion This adds the support for the GE2D version found in the AXG SoCs Family. The missing features are: - Source scaling - Colorspace conversion - Advanced alpha blending & blitting options Dependencies: - Patches 1-3: None - Patch 4: https://lkml.kernel.org/r/20200915124553.8056-1-narmstrong@baylibre.com (applied for 5.11) Changes since v2: - removed error check in and after get_frame() - moved the v4l2_file_operations lower in the code to avoid adding vidioc_setup_cap_fmt on top - removed all memcpy of pix_fmt - simplified & fixed ge2d_start_streaming - added local buffer type check in vidioc_g_selection instead of using get_frame error - removed impossible <0 rectangle check, fixed error string - added comment on condition after V4L2_CID_ROTATE Changes since v1: - Rebased on v5.10-rc1 / # v4l2-compliance -s v4l2-compliance SHA: ea16a7ef13a902793a5c2626b0cefc4d956147f3, 64 bits, 64-bit time_t Compliance test for meson-ge2d device /dev/video0: Driver Info: Driver name : meson-ge2d Card type : meson-ge2d Bus info : platform:meson-ge2d Driver version : 5.9.0 Capabilities : 0x84208000 Video Memory-to-Memory Streaming Extended Pix Format Device Capabilities Device Caps : 0x04208000 Video Memory-to-Memory Streaming Extended Pix Format Required ioctls: test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second /dev/video0 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK test invalid ioctls: 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: 4 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 test Composing: OK test Scaling: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) 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 58 buffers test MMAP (no poll): OK Video Capture: Captured 58 buffers test MMAP (select): OK Video Capture: Captured 58 buffers test MMAP (epoll): OK test USERPTR (no poll): OK (Not Supported) test USERPTR (select): OK (Not Supported) test DMABUF: Cannot test, specify --expbuf-device Total for meson-ge2d device /dev/video0: 52, Succeeded: 52, Failed: 0, Warnings: 0 Neil Armstrong (4): dt-bindings: media: Add bindings for the Amlogic GE2D Accelerator Unit media: meson: Add M2M driver for the Amlogic GE2D Accelerator Unit MAINTAINERS: Add myself as maintainer of the Amlogic GE2D driver arm64: dts: meson-axg: add GE2D node .../bindings/media/amlogic,axg-ge2d.yaml | 47 + MAINTAINERS | 9 + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 9 + drivers/media/platform/Kconfig | 13 + drivers/media/platform/Makefile | 2 + drivers/media/platform/meson/ge2d/Makefile | 3 + drivers/media/platform/meson/ge2d/ge2d-regs.h | 360 ++++++ drivers/media/platform/meson/ge2d/ge2d.c | 1091 +++++++++++++++++ 8 files changed, 1534 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml create mode 100644 drivers/media/platform/meson/ge2d/Makefile create mode 100644 drivers/media/platform/meson/ge2d/ge2d-regs.h create mode 100644 drivers/media/platform/meson/ge2d/ge2d.c