From patchwork Wed Oct 23 16:49:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13847807 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 A2772CFA45C for ; Wed, 23 Oct 2024 18:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To: Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject: 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=fv/1Z9tzison0vWkaRfplbCiwMhfJrTY+JcjjLZ4bRI=; b=JlqG40agnKs1W5 +vhQeimBY4wfCZp+KCNW5JCNP3vfnbM9+wSnfJa1KEuB9reu9yYAiDjGReZWvgBBcfABZwaS59Tto 3Rk9OUnvGJFnWqU0MRP9nZkBCgDaeMCrU2Cp0I/A1ts5hCPisNqvvZlbHjQlNcvJ7zpM39vBBKfJn AhDVjWXjn8UKgSdwdKVMhmbFuQLvH5sKLyOwSJGlsXWzE5/9wKionu8nvg1PUim8ed4CHMmOmnF2h i1g1edWsVVuvPiWYjQHWT8aeY9K2jvTMltRcZ50UsLWtZT+BdKPBiUIb9+cAgSq4Pnj22jqcbPh0/ 0U9Ahm6lUlEQeeYxzH8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3g8K-0000000FXqz-2IEl; Wed, 23 Oct 2024 18:31:00 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3eYk-0000000FDE2-3tMe for linux-arm-kernel@lists.infradead.org; Wed, 23 Oct 2024 16:50:12 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43167ff0f91so51296145e9.1 for ; Wed, 23 Oct 2024 09:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1729702208; x=1730307008; darn=lists.infradead.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=fv/1Z9tzison0vWkaRfplbCiwMhfJrTY+JcjjLZ4bRI=; b=ZXhERgwW5ZF4z8gT3FeJBJSlVibXil6mNgBaVH2/Hp0FOw9BmypH+uID+Y3LrYWybY 1zWgCjIkRoB2f7eV662kbpJPjzTXXLkEwqgtxzp/HUnuh41azedRbUpJsGKPNy74iAvt g0V3uon7Vv3bIY1hleOrkXBroMc6FuBORgCbpR+2ugq8zT2Esas4toTCOSS5HUOGjdob iSrR4EFmIqV1d8ZuzzHF5NiUrQrJSB9YI9sQCDDaXWp6s1Gwdh1sTvkttPTl1Fn2qFBr hov0xOQwfNNYOWuAsVKuqKQeqbkwOyJK2JsDxjOKZcnCAEAR4/7xxWppnbdPsnp5YSkT RGiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729702208; x=1730307008; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fv/1Z9tzison0vWkaRfplbCiwMhfJrTY+JcjjLZ4bRI=; b=ZFWVbq9pUVNCaTlgpfoqOMhaGZWKXzBPYoiMHgILXaU9BTpCkdUQ6TdFtAtzRZV2Df 7DCjxKg+dyM/89S4lNelFXG3RUjbWLr73BFappCY+c/MgCYOVyRB/56euIT3RvAbYSR7 R601BQEynQWoDqrkXMl8fyPcSU7hRkIrUCacoYcOQ2ZntLoyN8UxOo3KmWDyTVkz5F31 cC/D+qx3Eo2yTPWpAeCGBgn5PDsOLcEHDSwhOJHmntgq3g5NnVIf8TNLlS2bnRGkjdsY CPotfrwkUUAWfw3XZd46zYFKKZztUTSe8nROkHopaafKoX7/9Fblp50+cwHzzNg5uLeH 495Q== X-Forwarded-Encrypted: i=1; AJvYcCXlr9Ac3XBEg5T4pC+Yfm5YXmK4Rl+kQ8NuaPJeEucj9UNdbJh2QfOfWEQEfgChMTa3ucIO6LSAm8IZqiTOEm25@lists.infradead.org X-Gm-Message-State: AOJu0YziZon8zTZrhYNFYvcJ/lyFI02gkihXfWbh2Vx/opmg0HxojVi/ YMtGt7JrFT0fCOL1wOAMNW1fqEDVDwFNhc4WKZJTUKADRNMDibqQTVWpIOSIPJo= X-Google-Smtp-Source: AGHT+IFEi6issFTDuLur88QJO6Dp39hCaYAaxys3/Dw/x3s1p+bY6a0qlFbuGvX7ja9zZJDtSqTNRQ== X-Received: by 2002:a05:600c:1d99:b0:431:5f1c:8359 with SMTP id 5b1f17b1804b1-4318415f41fmr26199455e9.15.1729702208135; Wed, 23 Oct 2024 09:50:08 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-43186c50445sm21642035e9.39.2024.10.23.09.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 09:50:07 -0700 (PDT) From: Dave Stevenson Subject: [PATCH 00/37] drm/vc4: Add support for BCM2712 / Pi5 display hardware Date: Wed, 23 Oct 2024 17:49:57 +0100 Message-Id: <20241023-drm-vc4-2712-support-v1-0-1cc2d5594907@raspberrypi.com> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIADUpGWcC/x3MQQqEMAxA0atI1gbaVJTxKuKitFGzGC2pFkG8+ 5RZvsX/D2RW4Qxj84BykSzHXmHbBsLm95VRYjWQoc4aQxj1iyV0SIMlzFdKh5748dGR69kFv0B Nk/Ii9387ze/7A33lS+JmAAAA To: Maxime Ripard , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Michael Turquette , Stephen Boyd , Javier Martinez Canillas , Catalin Marinas , Will Deacon Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, Dave Stevenson , Dom Cobley X-Mailer: b4 0.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241023_095011_104072_F9058BE8 X-CRM114-Status: GOOD ( 16.60 ) 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 adds the required DRM, clock, and DT changes required to support the display hardware on Pi5. There are a couple of minor fixes first before the main patches. Many of the patches were authored by Maxime whilst working for us, however there have been a number of fixes squashed into his original patches as issues have been found. I also reworked the way UBM allocations are done to avoid double buffering of the handles as they are quite a limited resource. There are 2 variants of the IP. Most Pi5's released to date have used the C1 step of the SoC, whilst the 2GB Pi5 released in August is using the D0 step, as will other boards in future. Due to various reasons the register map got reworked between the steps, so there is extra code to handle the differences. Which step is in use is read out of the hardware, so they share a compatible string. Thanks! Signed-off-by: Dave Stevenson --- Dave Stevenson (12): drm/vc4: Limit max_bpc to 8 on Pi0-3 drm/vc4: Use of_device_get_match_data to set generation drm/vc4: Fix reading of frame count on GEN5 / Pi4 drm/vc4: drv: Add support for 2712 D-step drm/vc4: hvs: Add in support for 2712 D-step. drm/vc4: plane: Add support for 2712 D-step. drm/vc4: hdmi: Support 2712 D-step register map drm/vc4: Enable bg_fill if there are no planes enabled drm/vc4: Drop planes that are completely off-screen or 0 crtc size arm64: dts: broadcom: Add firmware clocks and power nodes to Pi5 DT arm64: dts: broadcom: Add display pipeline support to BCM2712 arm64: dts: broadcom: Add DT for D-step version of BCM2712 Dom Cobley (3): clk: bcm: rpi: Add ISP to exported clocks clk: bcm: rpi: Allow cpufreq driver to also adjust gpu clocks clk: bcm: rpi: Enable minimize for all firmware clocks Maxime Ripard (22): dt-bindings: display: Add BCM2712 HDMI bindings dt-bindings: display: Add BCM2712 HVS bindings dt-bindings: display: Add BCM2712 PixelValve bindings dt-bindings: display: Add BCM2712 MOP bindings dt-bindings: display: Add BCM2712 MOPLET bindings dt-bindings: display: Add BCM2712 KMS driver bindings drm/vc4: drv: Support BCM2712 drm/vc4: hvs: Add support for BCM2712 HVS drm/vc4: crtc: Add support for BCM2712 PixelValves drm/vc4: hdmi: Add support for BCM2712 HDMI controllers drm/vc4: txp: Introduce structure to deal with revision differences drm/vc4: txp: Rename TXP data structure drm/vc4: txp: Add byte enable toggle bit drm/vc4: txp: Add horizontal and vertical size offset toggle bit drm/vc4: txp: Handle 40-bits DMA Addresses drm/vc4: txp: Move the encoder type in the variant structure drm/vc4: txp: Add a new TXP encoder type drm/vc4: txp: Add support for BCM2712 MOP drm/vc4: txp: Add BCM2712 MOPLET support drm/vc4: Add additional warn_on for incorrect revisions clk: bcm: rpi: Create helper to retrieve private data clk: bcm: rpi: Add disp clock .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 + .../bindings/display/brcm,bcm2835-hvs.yaml | 5 +- .../bindings/display/brcm,bcm2835-pixelvalve0.yaml | 3 + .../bindings/display/brcm,bcm2835-txp.yaml | 5 +- .../bindings/display/brcm,bcm2835-vc4.yaml | 1 + arch/arm64/boot/dts/broadcom/Makefile | 1 + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 37 + arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 42 + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 188 +++++ drivers/clk/bcm/clk-raspberrypi.c | 34 +- drivers/gpu/drm/vc4/tests/vc4_mock.c | 8 +- drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 106 +-- drivers/gpu/drm/vc4/vc4_crtc.c | 96 ++- drivers/gpu/drm/vc4/vc4_drv.c | 19 +- drivers/gpu/drm/vc4/vc4_drv.h | 54 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 112 ++- drivers/gpu/drm/vc4/vc4_hdmi.h | 4 + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 640 +++++++++++++++ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 217 ++++++ drivers/gpu/drm/vc4/vc4_hvs.c | 737 ++++++++++++++++-- drivers/gpu/drm/vc4/vc4_kms.c | 102 ++- drivers/gpu/drm/vc4/vc4_plane.c | 866 ++++++++++++++++++++- drivers/gpu/drm/vc4/vc4_regs.h | 297 +++++++ drivers/gpu/drm/vc4/vc4_txp.c | 91 ++- include/soc/bcm2835/raspberrypi-firmware.h | 1 + 25 files changed, 3464 insertions(+), 204 deletions(-) --- base-commit: 91e21479c81dd4e9e22a78d7446f92f6b96a7284 change-id: 20241002-drm-vc4-2712-support-9ad3236e3caf Best regards,