drm/spacemit: add SpacemiT K3 display support
Subsystems (7)
v2 cover drm/spacemit: add SpacemiT K3 display support
This series adds display support for the SpacemiT K3 [2], a RISC-V SoC:
a new DRM driver, a new PHY driver and three new bindings.
The display path is three blocks deep:
Saturn DPU -> Innosilicon DP/eDP controller -> Innosilicon DP PHY
In v2, two major improvements:
- Module unload is now robust.
- The bindings now require the controller's output port (port@1).
The rest of the v2 changes please see below, with details in each patch's changelog.
Sashiko AI review contributed total review comments: 57 items, which I
accepted: 14 items.
v2 repeated the full v1 test matrix on both boards, in built-in and modular configurations, plus the new module load/unload rounds.
The v1 cover letter follows below, unchanged, to provide some backgroud (I can remove them from cover letter in next version):
The Saturn DPU is SpacemiT's own display processing unit. It has a private address translation unit and a command-list composer that replays a batch of register writes when a flush is latched. It exposes one CRTC with one primary plane. The K3 instantiates two DPUs, one per display path.
The DPU driver arrives as five staged patches to keep each one a reasonable size. The driver only becomes buildable with that last patch. Bisect safe.
The DP/eDP controller and its PHY are Innosilicon IP, also two instances of each. An instance behaves as embedded DisplayPort or as external DisplayPort purely according to what its output port is wired to, so the bindings do not distinguish them. The PHY's registers are interleaved with the controller's inside one MMIO window, which is why it is described as a child node and shares the controller's regmap.
The pixel clock is generated by the DP PHY's PLL, and the SoC's APMU pixel-clock mux takes that PLL as an input. Rather than let the display driver reach into PHY registers, the PHY registers its PLL as a clock provider and the APMU mux is parented to it through the clock framework. That is what patches 2, 4, 5 and 6 are for, and it is also what keeps the APMU and the DP/eDP controller out of a devicetree provider cycle.
As a first posting of the K3 display subsystem, this patchset supports:
a single primary plane per CRTC, linear RGB scanout (no plane scaling, rotation, YUV or writeback). It does not support DSI, DSC or DP audio, and link rates are capped at HBR2.
Based on drm-misc-next at commit 5b9af25f2d0b ("accel/ivpu: Remove unnecessary min_t()/max_t() usage"), v7.2-rc2 based.
Testing this series needs a SpacemiT u-boot carrying display support [1]. SpacemiT expects to add that support into an official u-boot release in August 2026.
Tested on two K3 boards:
- Pico-ITX: an eDP panel and an external DisplayPort monitor.
- CoM260-IFX: DisplayPort only, no eDP.
Note: The eDP panel DTS enablement is not part of this series; a separate
series will follow showing how eDP can be verified.
What was run on both boards, with modetest from libdrm and with kmscube:
- modetest -s, looped over 1920x1080, 1280x720 and 3840x2160
on DisplayPort and 2560x1600 on eDP
- kmscube, on each head and on both at once
- hot-plug and sink swap on the DisplayPort connector
Both built-in and modular configurations were tested. Patch 17 defconfig adds them as modules.
[1] https://github.com/spacemit-com/uboot-for-k3-display-verify/tree/k3-br-v1.0.y
[2] https://www.spacemit.com/community/document/info?lang=en&nodepath=hardware/key_stone/k3
Changes in v2:
- unbind: keep the online IRQ alive until the teardown commits have drained; module unload no longer rides two watchdog timeouts
- bridge teardown on devres: reset via devm_reset_control_get_exclusive_deasserted(), pxclk disable as a
devm action ordered against the PHY child (Philipp Zabel, Yao Zi)
- all five DPU reset lines behind one reset_control_bulk_* pair
(Philipp Zabel, Guodong Xu)
- bindings: port@1 is now required; the CoM260 board describes its DP receptacle with a dp-connector node; redundant minItems dropped
(Rob Herring)
- possible_crtcs derived from the input endpoint only
- EDID reads through the AUX I2C adapter; write-1-to-clear interrupt
acks by plain write; assorted dead code dropped
- picked up Rob Herring's Reviewed-by on patches 1-3
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Cody Kang (17):
dt-bindings: display: spacemit: add K3 Saturn DPU controller
dt-bindings: phy: add SpacemiT K3 Innosilicon DP PHY
dt-bindings: display: spacemit: add K3 Innosilicon DP/eDP controller
dt-bindings: soc: spacemit: allow eDP/DP PHY PLL pixel clocks on K3 APMU
phy: spacemit: add Innosilicon DP TX PHY driver
clk: spacemit: k3: parent eDP/DP pixel clock to the PHY PLL drm/spacemit: add Saturn DPU register model
drm/spacemit: add Saturn DPU core types, cmdlist and display MMU drm/spacemit: add Saturn DPU hardware backend
drm/spacemit: add Saturn DPU KMS pipeline
drm/spacemit: add Saturn DPU DRM device driver drm/spacemit: add Innosilicon DP/eDP controller bridge driver
MAINTAINERS: add SpacemiT K3 display driver entry
riscv: dts: spacemit: k3: add display nodes
riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
riscv: dts: spacemit: k3-com260-ifx: enable the DisplayPort output
riscv: defconfig: spacemit: k3: enable display driver
.../display/spacemit/spacemit,k3-inno-dp.yaml | 141 ++ .../display/spacemit/spacemit,k3-saturn-dpu.yaml | 132 ++ .../bindings/phy/spacemit,k3-inno-dp-phy.yaml | 48 + .../bindings/soc/spacemit/spacemit,k1-syscon.yaml | 21 +- MAINTAINERS | 10 + arch/riscv/boot/dts/spacemit/k3-com260-ifx.dts | 27 + arch/riscv/boot/dts/spacemit/k3-display.dtsi | 166 ++ arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 11 + arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi | 22 + arch/riscv/configs/defconfig | 2 + drivers/clk/spacemit/ccu-k3.c | 4 +- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/spacemit/Kconfig | 37 + drivers/gpu/drm/spacemit/Makefile | 15 + drivers/gpu/drm/spacemit/dpu/dpu_saturn.c | 479 ++++ drivers/gpu/drm/spacemit/dpu/dpu_saturn.h | 35 + drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c | 896 ++++++++ drivers/gpu/drm/spacemit/dpu/dpu_trace.h | 350 +++ drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.c | 152 ++ drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.h | 21 + drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h | 25 + drivers/gpu/drm/spacemit/dpu/saturn_regs/ops_hee.h | 51 + .../gpu/drm/spacemit/dpu/saturn_regs/reg_map_hee.h | 64 + .../drm/spacemit/dpu/saturn_regs/saturn_fields.h | 298 +++ drivers/gpu/drm/spacemit/spacemit_cmdlist.c | 304 +++ drivers/gpu/drm/spacemit/spacemit_cmdlist.h | 146 ++ drivers/gpu/drm/spacemit/spacemit_crtc.c | 786 +++++++ drivers/gpu/drm/spacemit/spacemit_crtc.h | 246 ++ drivers/gpu/drm/spacemit/spacemit_dmmu.c | 80 + drivers/gpu/drm/spacemit/spacemit_dmmu.h | 40 + drivers/gpu/drm/spacemit/spacemit_dpu_ids.h | 22 + drivers/gpu/drm/spacemit/spacemit_dpu_reg.h | 108 + drivers/gpu/drm/spacemit/spacemit_drm.c | 140 ++ drivers/gpu/drm/spacemit/spacemit_drm.h | 61 + drivers/gpu/drm/spacemit/spacemit_inno_dp.c | 2391 ++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_inno_dp.h | 329 +++ drivers/gpu/drm/spacemit/spacemit_planes.c | 377 +++ drivers/phy/spacemit/Kconfig | 13 + drivers/phy/spacemit/Makefile | 1 + drivers/phy/spacemit/phy-k3-inno-dp.c | 967 ++++++++ 41 files changed, 9017 insertions(+), 3 deletions(-)
---
base-commit: 5b9af25f2d0b574b4058c9f8c84486a597168116
change-id: 20260713-k3-display-e8ffed67e936
Best regards,
Signature · 1 line
Cody Kang <[email protected]>
PATCH v2 1/17 dt-bindings: display: spacemit: add K3 Saturn DPU controller
Document the Saturn display processing unit found on the SpacemiT K3 SoC. The K3 instantiates two of them, one per display path. They share a
compatible: an instance differs only in which register window, interrupt, clock and reset lines it takes.
---
v2:
- add Reviewed-by: Rob Herring (Arm)
--- .../display/spacemit/spacemit,k3-saturn-dpu.yaml | 132 +++++++++++++++++++++ 1 file changed, 132 insertions(+)
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-saturn-dpu.yaml new file +132 -0
@@ -0,0 +1,132 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/spacemit/spacemit,k3-saturn-dpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SpacemiT K3 Saturn Display Processing Unit + +maintainers: + - Cody Kang <[email protected]> + +description: + The Saturn DPU is the display processing unit of the SpacemiT K3 SoC. It + composes the display planes and drives the timing for one display path. Its + output goes to a DisplayPort or embedded DisplayPort controller. The K3 has + two instances. + +properties: + compatible: + const: spacemit,k3-saturn-dpu + + reg: + maxItems: 1 + + interrupts: + items: + - description: Online (live display) compose path. + - description: Offline (writeback) compose path. + + interrupt-names: + items: + - const: online + - const: offline + + clocks: + items: + - description: Pixel clock. + - description: Memory clock for the compose pipeline. + - description: AXI bus clock. + - description: DSI escape clock. + - description: DSC clock. + + clock-names: + items: + - const: pxclk + - const: mclk + - const: aclk + - const: escclk + - const: dscclk + + resets: + items: + - description: Memory clock domain. + - description: LCD domain, shared with the downstream controller. + - description: DSI escape clock domain. + - description: AXI clock domain. + - description: DSC domain. + + reset-names: + items: + - const: mclk + - const: lcd + - const: esc + - const: aclk + - const: dsc + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: Video output to the DisplayPort or eDP controller. + + required: + - port@0 + +required: + - compatible + - reg + - interrupts + - interrupt-names + - clocks + - clock-names + - resets + - reset-names + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/spacemit,k3-clocks.h> + #include <dt-bindings/reset/spacemit,k3-resets.h> + #include <dt-bindings/interrupt-controller/irq.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + dpu@c0340000 { + compatible = "spacemit,k3-saturn-dpu"; + reg = <0x0 0xc0340000 0x0 0x54000>; + interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, + <89 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "online", "offline"; + clocks = <&syscon_apmu CLK_APMU_LCD_PXCLK>, + <&syscon_apmu CLK_APMU_LCD_MCLK>, + <&syscon_apmu CLK_APMU_DPU_ACLK>, + <&syscon_apmu CLK_APMU_DSI_ESC>, + <&syscon_apmu CLK_APMU_LCD_DSC>; + clock-names = "pxclk", "mclk", "aclk", "escclk", "dscclk"; + resets = <&syscon_apmu RESET_APMU_LCD_MCLK>, + <&syscon_apmu RESET_APMU_LCD>, + <&syscon_apmu RESET_APMU_DSI_ESC>, + <&syscon_apmu RESET_APMU_DPU_ACLK>, + <&syscon_apmu RESET_APMU_LCD_DSCCLK>; + reset-names = "mclk", "lcd", "esc", "aclk", "dsc"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + endpoint { + remote-endpoint = <&edp0_in>; + }; + }; + }; + }; + };
Signature · 1 line
2.43.0
PATCH v2 2/17 dt-bindings: phy: add SpacemiT K3 Innosilicon DP PHY
In reply to Cody KangThe SpacemiT K3 DisplayPort controller drives its four transmit lanes through an integrated Innosilicon DP PHY, one PHY per controller. Add a binding so the controller can reference its transmit PHY and the pixel clock the PHY's PLL sources.
The PHY's registers are interleaved with its parent controller's inside one MMIO window, so it owns neither a reg nor a reset and is modelled as a child of the controller.
It exposes its PLL-generated pixel clock through #clock-cells, so the APMU pixel-clock mux can select it as a parent through the clock framework.
---
v2:
- add Reviewed-by: Rob Herring (Arm)
--- .../bindings/phy/spacemit,k3-inno-dp-phy.yaml | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+)
Documentation/devicetree/bindings/phy/spacemit,k3-inno-dp-phy.yaml new file +48 -0
@@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/spacemit,k3-inno-dp-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SpacemiT K3 Innosilicon DisplayPort PHY + +maintainers: + - Cody Kang <[email protected]> + +description: + Innosilicon four-lane DisplayPort transmit PHY integrated in the SpacemiT + K3 SoC, one per DisplayPort controller. Its registers are interleaved with + the controller's own inside a single register window, so it is described as + a child of the controller and owns neither a reg nor a reset. + + The PHY provides the pixel clock its PLL generates, which the APMU + pixel-clock mux takes as one of its inputs. + +properties: + compatible: + const: spacemit,k3-inno-dp-phy + + "#phy-cells": + const: 0 + + "#clock-cells": + const: 0 + + clock-output-names: + maxItems: 1 + +required: + - compatible + - "#phy-cells" + - "#clock-cells" + +additionalProperties: false + +examples: + - | + phy { + compatible = "spacemit,k3-inno-dp-phy"; + #phy-cells = <0>; + #clock-cells = <0>; + clock-output-names = "edp0_pll_pxclk"; + };
Signature · 1 line
2.43.0
PATCH v2 3/17 dt-bindings: display: spacemit: add K3 Innosilicon DP/eDP controller
In reply to Cody KangBoth K3 instances are the same IP and share one compatible; which one behaves as eDP is decided by what its downstream port is wired to, not by which register window it sits in, so the binding does not distinguish them.
---
v2:
- make port@1 required (Rob Herring)
- add Reviewed-by: Rob Herring (Arm)
--- .../display/spacemit/spacemit,k3-inno-dp.yaml | 141 +++++++++++++++++++++ 1 file changed, 141 insertions(+)
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-inno-dp.yaml new file +141 -0
@@ -0,0 +1,141 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/spacemit/spacemit,k3-inno-dp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SpacemiT K3 Innosilicon DisplayPort / embedded DisplayPort Controller + +maintainers: + - Cody Kang <[email protected]> + +description: + Innosilicon DisplayPort transmit controller integrated in the SpacemiT K3 + SoC. The K3 has two instances of the same block sharing one compatible; + each acts as embedded or external DisplayPort depending on whether its + output port drives a panel or a connector. + +properties: + compatible: + const: spacemit,k3-inno-dp + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + description: Link and hot-plug events. + + clocks: + items: + - description: Pixel clock for the controller. + - description: + Pixel clock generated by the DP PHY PLL; the pixel clock above is + parented onto it in use. + + clock-names: + items: + - const: pxclk + - const: pll + + resets: + maxItems: 1 + description: Controller-wide reset signal. + + phys: + maxItems: 1 + description: Phandle to the K3 Innosilicon DP PHY. + + phy-names: + items: + - const: dp + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: Video input from the DPU. + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: Output to the panel or to the DisplayPort connector. + + required: + - port@0 + - port@1 + + aux-bus: + $ref: /schemas/display/dp-aux-bus.yaml# + description: + The DisplayPort AUX bus. Present when the output drives an embedded + panel, which is described as a child of this node and identifies itself + over AUX. Absent when the output is a connector. + + phy: + $ref: /schemas/phy/spacemit,k3-inno-dp-phy.yaml# + description: + The DisplayPort PHY. Its registers live inside this controller's + register window, so it is described here as a child node. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - phys + - phy-names + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/spacemit,k3-clocks.h> + #include <dt-bindings/reset/spacemit,k3-resets.h> + #include <dt-bindings/interrupt-controller/irq.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + edp@cac84000 { + compatible = "spacemit,k3-inno-dp"; + reg = <0x0 0xcac84000 0x0 0x4000>; + interrupts = <132 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon_apmu CLK_APMU_EDP0_PXCLK>, <&edp0_phy>; + clock-names = "pxclk", "pll"; + resets = <&syscon_apmu RESET_APMU_EDP0>; + phys = <&edp0_phy>; + phy-names = "dp"; + + edp0_phy: phy { + compatible = "spacemit,k3-inno-dp-phy"; + #phy-cells = <0>; + #clock-cells = <0>; + clock-output-names = "edp0_pll_pxclk"; + }; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + endpoint { + remote-endpoint = <&dpu0_out>; + }; + }; + + port@1 { + reg = <1>; + endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + }; + };
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 03/17] dt-bindings: display: spacemit: add K3 Innosilicon DP/eDP controller
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Probe deadlock and circular dependency due to the parent DP controller consuming a clock and PHY…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Probe deadlock and circular dependency due to the parent DP controller consuming a clock and PHY provided by its own child node. --
--- Patch [3]: [PATCH v2 03/17] dt-bindings: display: spacemit: add K3 Innosilicon DP/eDP controller --- commit ead86f1749dc824cd3f2b3c8dc8d28611bfc6866
Author: Cody Kang <[email protected]>
dt-bindings: display: spacemit: add K3 Innosilicon DP/eDP controller
This commit adds the device tree binding schema for the Innosilicon DisplayPort transmit controller on the SpacemiT K3 SoC. It includes definitions for the DP PHY child node which provides clocks and PHY resources to the parent DP controller.
Quoted 4 lines
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-inno-dp.yaml new file +0
-0
[ ... ]
Quoted 2 lines
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-inno-dp.yaml new file +2
-0+examples: + - |
[ ... ]
Quoted 4 lines
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-inno-dp.yaml new file +4
-0+ edp@cac84000 { + compatible = "spacemit,k3-inno-dp"; + reg = <0x0 0xcac84000 0x0 0x4000>; + interrupts = <132 IRQ_TYPE_LEVEL_HIGH>;
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-inno-dp.yaml line 118
Quoted 10 lines
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-inno-dp.yaml new file +10
-0+ clocks = <&syscon_apmu CLK_APMU_EDP0_PXCLK>, <&edp0_phy>; + clock-names = "pxclk", "pll"; + resets = <&syscon_apmu RESET_APMU_EDP0>; + phys = <&edp0_phy>; + phy-names = "dp"; + + edp0_phy: phy { + compatible = "spacemit,k3-inno-dp-phy"; + #phy-cells = <0>; + #clock-cells = <0>;
[Severity: High]
Does modeling the PHY and clock resources this way create a circular probe dependency?
The parent node references its own child node (edp0_phy) for both clocks and phys. If the parent requests these resources via standard APIs during its probe function, it will likely receive an indefinite -EPROBE_DEFER.
The child cannot probe and register its resources until the parent completes enough of its own probe to populate its children.
Is there a specific driver sequence expected here to avoid this deadlock, or should the hardware abstraction be represented differently to avoid the self-referential phandles?
Quoted 2 lines
Documentation/devicetree/bindings/display/spacemit/spacemit,k3-inno-dp.yaml new file +2
-0+ clock-output-names = "edp0_pll_pxclk"; + };
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
PATCH v2 4/17 dt-bindings: soc: spacemit: allow eDP/DP PHY PLL pixel clocks on K3 APMU
In reply to Cody KangThe APMU's eDP pixel-clock muxes select the DP PHY PLLs as parents, so the K3 syscon takes two clock inputs the other variants do not have.
Gate them behind the K3 compatible instead of widening the shared clock list, so a non-K3 syscon cannot silently accept clocks it has no mux for.
---
v2:
- drop the redundant minItems: 4; four is already the minimum (Rob Herring)
--- .../bindings/soc/spacemit/spacemit,k1-syscon.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml +20 -1
@@ -31,14 +31,18 @@ properties: maxItems: 1 clocks: - maxItems: 4 + minItems: 4 + maxItems: 6 clock-names: + minItems: 4 items: - const: osc - const: vctcxo_1m - const: vctcxo_3m - const: vctcxo_24m + - const: edp0_pll_pxclk + - const: edp1_pll_pxclk "#clock-cells": const: 1
@@ -95,6 +99,21 @@ allOf: - clocks - clock-names - "#clock-cells" + # Only the K3 APMU exposes the two eDP/DP PHY PLL pixel clocks as extra + # inputs (parents of its eDP pixel-clock muxes); every other variant has + # the four base oscillator inputs only. + - if: + not: + properties: + compatible: + contains: + const: spacemit,k3-syscon-apmu + then: + properties: + clocks: + maxItems: 4 + clock-names: + maxItems: 4 additionalProperties: false
Signature · 1 line
2.43.0
Rob Herring (Arm)
maintainerRe: [PATCH v2 04/17] dt-bindings: soc: spacemit: allow eDP/DP PHY PLL pixel clocks on K3 APMU
Quoted 8 lines · Cody Kang
The APMU's eDP pixel-clock muxes select the DP PHY PLLs as parents, so the K3 syscon takes two clock inputs the other variants do not have.
Gate them behind the K3 compatible instead of widening the shared clock list, so a non-K3 syscon cannot silently accept clocks it has no mux for.
Signed-off-by Cody Kang <[email protected]>
Quoted 8 lines
---
v2:
- drop the redundant minItems: 4; four is already the minimum (Rob Herring)--- .../bindings/soc/spacemit/spacemit,k1-syscon.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:Documentation/devicetree/bindings/display/imx/fsl,imx-lcdc.example.dtb: display0: fsl,pcr: b'\xf0\xc8\x80\x80' is not of type 'object', 'integer', 'array', 'boolean', 'null'
from schema $id: http://devicetree.org/schemas/dt-core.yaml
doc reference errors (make refcheckdocs):
See https://patchwork.kernel.org/project/devicetree/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Re: [PATCH v2 04/17] dt-bindings: soc: spacemit: allow eDP/DP PHY PLL pixel clocks on K3 APMU
In reply to Cody KangQuoted 8 lines · Cody Kang
The APMU's eDP pixel-clock muxes select the DP PHY PLLs as parents, so the K3 syscon takes two clock inputs the other variants do not have.
Gate them behind the K3 compatible instead of widening the shared clock list, so a non-K3 syscon cannot silently accept clocks it has no mux for.
Signed-off-by Cody Kang <[email protected]>
Quoted 8 lines
---
v2:
- drop the redundant minItems: 4; four is already the minimum (Rob Herring)--- .../bindings/soc/spacemit/spacemit,k1-syscon.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
PATCH v2 5/17 phy: spacemit: add Innosilicon DP TX PHY driver
In reply to Cody KangThe PHY's registers are interleaved into its parent DP controller's MMIO window rather than a window of its own, so it probes as a child of the controller, carries no reg or reset, and reaches its registers through the controller's regmap.
It registers its pixel PLL as a clock provider. That lets the display controller ask for a mode's pixel rate through clk_set_rate(), and it lets the APMU pixel-clock mux parent to the PHY through the clock framework. Without it the controller and PHY would have to know each other's registers.
---
v2:
- drop the mod_devicetable.h include (Uwe Kleine-Koenig)
- unwind the lanes and pixel PLL on the power_on lock-timeout paths (Sashiko)
- document why power_off keeps the MPLL up: it feeds the 16 MHz AUX reference, and AUX must survive link drops (Sashiko)
- register the PHY and clock providers last in probe (Sashiko)
--- drivers/phy/spacemit/Kconfig | 13 + drivers/phy/spacemit/Makefile | 1 + drivers/phy/spacemit/phy-k3-inno-dp.c | 967 ++++++++++++++++++++++++++++++++++ 3 files changed, 981 insertions(+)
drivers/phy/spacemit/Kconfig +13 -0
@@ -23,3 +23,16 @@ config PHY_SPACEMIT_K1_USB2 help Enable this to support K1 USB 2.0 PHY driver. This driver takes care of enabling and clock setup and will be used by K1 udc/ehci/otg/xhci driver. + +config PHY_SPACEMIT_K3_INNO_DP + tristate "SpacemiT K3 Innosilicon DisplayPort PHY driver" + depends on (ARCH_SPACEMIT || COMPILE_TEST) && OF + depends on COMMON_CLK + select GENERIC_PHY + select REGMAP + help + Enable support for the Innosilicon DisplayPort transmit PHY + integrated in the SpacemiT K3 SoC. The PHY shares its MMIO window + with its parent DP/eDP controller (drivers/gpu/drm/spacemit/) and + exposes lane / rate / vswing / pre-emphasis control through the + generic PHY framework.
drivers/phy/spacemit/Makefile +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_PHY_SPACEMIT_K1_PCIE) += phy-k1-pcie.o obj-$(CONFIG_PHY_SPACEMIT_K1_USB2) += phy-k1-usb2.o +obj-$(CONFIG_PHY_SPACEMIT_K3_INNO_DP) += phy-k3-inno-dp.o
drivers/phy/spacemit/phy-k3-inno-dp.c new file +967 -0
967 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 05/17] phy: spacemit: add Innosilicon DP TX PHY driver
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider: - [High] Missing driver-level lock between concurrent clock and PHY operations creates a race condition on…
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
- [High] Missing driver-level lock between concurrent clock and PHY operations creates a race condition on PREPLL state.
- [Medium] Failure to handle XMIT_EN regmap write error leaks the PREPLL power state during k3_inno_dp_phy_power_on.
- [Medium] k3_inno_dp_pxclk_set_rate unconditionally powers up the PREPLL, undermining PHY power management. --
--- Patch [5]: [PATCH v2 05/17] phy: spacemit: add Innosilicon DP TX PHY driver --- commit 29f359dc5de12bf07a1c791d1b6d5ab3f658ed91
Author: Cody Kang <[email protected]>
phy: spacemit: add Innosilicon DP TX PHY driver
Adds support for the Innosilicon DisplayPort transmit PHY integrated in the SpacemiT K3 SoC. The PHY shares its MMIO window with its parent DP/eDP controller and registers its pixel PLL as a clock provider.
Quoted 5 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +0
-0
[ ... ]
Quoted 15 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +15
-0+static int k3_inno_dp_phy_power_on (struct phy *phy) +{ +struct k3_inno_dp_phy *p =phy_get_drvdata (phy); +u32 lane_en; +u32 val; +int ret; + +switch (p->lanes) { +case 1 : + lane_en =0x1 ; +break ; +case 2 : + lane_en =0x3 ; +break ; +case 4 :
drivers/phy/spacemit/phy-k3-inno-dp.c line 125
Quoted 10 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +10
-0+default : + lane_en =0xf ; +break ; + } + + ret =regmap_write_bits (p->regmap,DPTX_ANA_MPLL ,DPTX_ANA_MPLL_PD ,0 ); +if (ret) +return ret; + ret =regmap_write_bits (p->regmap,DPTX_ANA_PREPLL , +DPTX_ANA_PREPLL_PD ,0 );
[Severity: High]
Is a driver-level lock needed to prevent races between the PHY and clock frameworks?
The clock framework serializes clk_set_rate() (which calls k3_inno_dp_program_prepll() below), and the PHY framework serializes phy_power_on(), but they don't synchronize with each other.
A clock rate change can race with this PHY power-on, allowing the PHY to clear the PD bit here while the clock framework is midway through reprogramming the PLL dividers.
drivers/phy/spacemit/phy-k3-inno-dp.c line 134
Quoted 9 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +9
-0+if (ret) +return ret; +usleep_range (2000 ,4000 ); + + ret =regmap_write_bits (p->regmap,DPTX_PHY_CTRL , +DPTX_PHY_CTRL_XMIT_EN , +FIELD_PREP (DPTX_PHY_CTRL_XMIT_EN , lane_en)); +if (ret) +return ret;
[Severity: Medium]
Does this skip the required DPTX_ANA_PREPLL_PD rollback?
If this regmap write fails, returning directly bypasses the err_power_down cleanup label. This would leave the pixel PLL powered up indefinitely.
Quoted 5 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +5
-0+usleep_range (2000 ,4000 ); + + ret =regmap_read_poll_timeout (p->regmap,DPTX_ANA_MPLL , val, + val &DPTX_ANA_MPLL_LOCKED , +2000 ,10 *1000 );
[ ... ]
Quoted 9 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +9
-0+static void k3_inno_dp_program_prepll (struct k3_inno_dp_phy *p, +const struct k3_inno_dp_prepll_cfg *cfg) +{ +regmap_write_bits (p->regmap,DPTX_ANA_PREPLL ,DPTX_ANA_PREPLL_PD , +FIELD_PREP (DPTX_ANA_PREPLL_PD ,1 )); +usleep_range (2000 ,4000 ); + +regmap_write_bits (p->regmap,DPTX_ANA_PREPLL ,DPTX_ANA_PREPLL_PREDIV , +FIELD_PREP (DPTX_ANA_PREPLL_PREDIV , cfg->prediv));
[ ... ]
Quoted 4 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +4
-0+regmap_write_bits (p->regmap,DPTX_ANA_PREPLL_CTRL , +DPTX_ANA_PREPLL_PCLKDIV5_EN , +FIELD_PREP (DPTX_ANA_PREPLL_PCLKDIV5_EN , cfg->div5_en)); + regmap_write_bits(p->regmap, DPTX_ANA_PREPLL_CTRL,
drivers/phy/spacemit/phy-k3-inno-dp.c line 814
Quoted 10 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +10
-0+DPTX_ANA_PREPLL_PCLK_DIVAUX , + FIELD_PREP(DPTX_ANA_PREPLL_PCLK_DIVAUX, cfg->divp)); + +regmap_write_bits (p->regmap,DPTX_ANA_PREPLL , +DPTX_ANA_PREPLL_PCLK_NORMAL , +FIELD_PREP (DPTX_ANA_PREPLL_PCLK_NORMAL ,1 )); +usleep_range (2000 ,4000 ); + +regmap_write_bits (p->regmap,DPTX_ANA_PREPLL ,DPTX_ANA_PREPLL_PD , +FIELD_PREP (DPTX_ANA_PREPLL_PD ,0 ));
[Severity: Medium]
Does this unconditionally power up the PREPLL, even if the PHY is currently turned off?
The clock framework can call set_rate() when the display pipeline is disabled (for example, via assigned-clock-rates during boot). Since the clock provider doesn't implement a .disable callback, this appears to force the PLL to turn on and stay powered up until a subsequent phy_power_off() cycle occurs.
Quoted 2 lines
drivers/phy/spacemit/phy-k3-inno-dp.c new file +2
-0+usleep_range (2000 ,4000 ); +}
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
PATCH v2 6/17 clk: spacemit: k3: parent eDP/DP pixel clock to the PHY PLL
In reply to Cody KangThe APMU eDP/DP pixel-clock muxes were parented to a placeholder, because their real parents (the DP PHY PLLs) did not exist as clocks yet. They do now, so point each mux at its PLL and let the pixel clock reach the controller through the clock framework.
---
v2:
- no change
--- drivers/clk/spacemit/ccu-k3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/spacemit/ccu-k3.c +2 -2
@@ -937,13 +937,13 @@ CCU_MUX_DIV_GATE_FC_DEFINE(ufs_aclk, ufs_aclk_parents, APMU_UFS_CLK_RES_CTRL, 5,static const struct clk_parent_data edp0_pclk_parents[] = {CCU_PARENT_HW (lcd_pxclk), -CCU_PARENT_NAME (external_clk), +CCU_PARENT_NAME (edp0_pll_pxclk), };CCU_MUX_GATE_DEFINE (edp0_pxclk, edp0_pclk_parents,APMU_LCD_EDP_CTRL ,2 ,1 ,BIT (1 ),0 );static const struct clk_parent_data edp1_pclk_parents[] = {CCU_PARENT_HW (dsi4ln2_lcd_pxclk), -CCU_PARENT_NAME (external_clk), +CCU_PARENT_NAME (edp1_pll_pxclk), };CCU_MUX_GATE_DEFINE (edp1_pxclk, edp1_pclk_parents,APMU_LCD_EDP_CTRL ,18 ,1 ,BIT (17 ),0 );
Signature · 1 line
2.43.0
Re: [PATCH v2 06/17] clk: spacemit: k3: parent eDP/DP pixel clock to the PHY PLL
Quoted 19 lines · Cody Kang
The APMU eDP/DP pixel-clock muxes were parented to a placeholder, because their real parents (the DP PHY PLLs) did not exist as clocks yet. They do now, so point each mux at its PLL and let the pixel clock reach the controller through the clock framework.
Signed-off-by Cody Kang <[email protected]>---
v2:
- no change--- drivers/clk/spacemit/ccu-k3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/clk/spacemit/ccu-k3.c +0
-0
drivers/clk/spacemit/ccu-k3.c CCU_MUX_DIV_GATE_FC_DEFINE(ufs_aclk, ufs_aclk_parents, APMU_UFS_CLK_RES_CTRL, 5, · line 940
Quoted 5 lines
drivers/clk/spacemit/ccu-k3.c +1
-1@@ -937,13 +937,13 @@ CCU_MUX_DIV_GATE_FC_DEFINE(ufs_aclk, ufs_aclk_parents, APMU_UFS_CLK_RES_CTRL, 5,static const struct clk_parent_data edp0_pclk_parents[] = {CCU_PARENT_HW (lcd_pxclk), -CCU_PARENT_NAME (external_clk), +CCU_PARENT_NAME (edp0_pll_pxclk),
hidden behind this macro is a .fw_name. Basically these are your DT input names. You can't change them at will like that because your bindings are supposed to be stable.
You should not use placeholder name, ever. No need to make the name too specific either, from the beginning it should have been something like "pixel_pll" or whatever your doc refer it with.
"external_clk" is not declared in your bindings AFAICT, so at least it should be fine to remove it.
There need to be a dt-binding patch documenting the new name you need and then you can start using it in the driver.
In the future, please try to document all the inputs of your controller in the bindings. Even if you do not use them yet, they exist.
Quoted 14 lines
drivers/clk/spacemit/ccu-k3.c +1
-1};CCU_MUX_GATE_DEFINE (edp0_pxclk, edp0_pclk_parents,APMU_LCD_EDP_CTRL ,2 ,1 ,BIT (1 ),0 );static const struct clk_parent_data edp1_pclk_parents[] = {CCU_PARENT_HW (dsi4ln2_lcd_pxclk), -CCU_PARENT_NAME (external_clk), +CCU_PARENT_NAME (edp1_pll_pxclk), };CCU_MUX_GATE_DEFINE (edp1_pxclk, edp1_pclk_parents,APMU_LCD_EDP_CTRL ,18 ,1 ,BIT (17 ),0 );Signature · 2 lines
-- 2.43.0
Signature · 1 line
Jerome
Re: [PATCH v2 06/17] clk: spacemit: k3: parent eDP/DP pixel clock to the PHY PLL
Hi Jerome,
Quoted 1 line · Jerome Brunet
On dim. 09 août 2026 at 21:14, Cody Kang <[email protected]> wrote:
[...]
Quoted 8 lines
drivers/clk/spacemit/ccu-k3.c CCU_MUX_DIV_GATE_FC_DEFINE(ufs_aclk, ufs_aclk_parents, APMU_UFS_CLK_RES_CTRL, 5, · line 940
Quoted 4 lines
static const struct
clk_parent_dataedp0_pclk_parents[] = {drivers/clk/spacemit/ccu-k3.c +1
-1CCU_PARENT_HW (lcd_pxclk), - CCU_PARENT_NAME(external_clk), + CCU_PARENT_NAME(edp0_pll_pxclk),hidden behind this macro is a .fw_name. Basically these are your DT input names. You can't change them at will like that because your bindings are supposed to be stable.
Thanks for the review.
Quoted 3 lines
You should not use placeholder name, ever. No need to make the name too specific either, from the beginning it should have been something like "
pixel_pll" or whatever your doc refer it with.
Agreed. The new names follow the documentation: the K3 user manual describes these two mux inputs as "pixclk from eDP0 PLL" and "pixclk from eDP1 PLL" (PMU_LCD_EDP_CTRL, fields EDP0_PIXCLK_SEL and EDP1_PIXCLK_SEL).
Quoted 2 lines
"
external_clk" is not declared in your bindings AFAICT, so at least it should be fine to remove it.
Right. It is in no binding and no device tree in the tree supplies it, so nothing that follows the bindings changes.
Quoted 2 lines
There need to be a dt-binding patch documenting the new name you need and then you can start using it in the driver.
Patch 04 of this series is that patch ("dt-bindings: soc: spacemit:
allow eDP/DP PHY PLL pixel clocks on K3 APMU"). It comes before this one.
I will change the commit message in v3 to better align with the logic you described.
Quoted 2 lines
In the future, please try to document all the inputs of your controller in the bindings. Even if you do not use them yet, they exist.
My read is that comment is more to the original commit where 'external_clk' being commited, which is not from me. But yes, I agree with you.
Cody
PATCH v2 7/17 drm/spacemit: add Saturn DPU register model
In reply to Cody KangThe Saturn display processing unit is programmed through a set of register blocks (composer, RDMA, timing generator, cmdlist engine, display MMU) laid out identically in both SoC instances. Add the block address map, the per-field word offset and mask tables consumed by the field accessors, the interrupt bit layout and the compositor and output-format ID encodings. The address map describes the whole IP block on purpose, including blocks the driver does not touch; the field tables carry the fields the driver programs, with each block's full word count kept as its NWORDS extent.
Consumers arrive with the following patches; the driver only becomes buildable once the final patch adds the Kconfig and Makefile glue.
---
v2:
- no change
--- drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h | 25 ++ .../gpu/drm/spacemit/dpu/saturn_regs/reg_map_hee.h | 64 +++++ .../drm/spacemit/dpu/saturn_regs/saturn_fields.h | 298 +++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_dpu_ids.h | 22 ++ 4 files changed, 409 insertions(+)
drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef DPU_INT_REG_H +#define DPU_INT_REG_H + +#include <linux/bits.h> + +#define DPU_INT_CMDLIST_CH_FRM_CFG_DONE_MASK (0xff) +#define DPU_INT_CMDLIST_CH_FRM_CFG_DONE (DPU_INT_CMDLIST_CH_FRM_CFG_DONE_MASK << 11) +#define DPU_INT_FRM_TIMING_UNFLOW BIT(8) +#define DPU_INT_CFG_RDY_CLR BIT(5) +#define DPU_INT_FRM_TIMING_CFG_LINE BIT(4) +#define DPU_INT_FRM_TIMING_CFG_EOF (BIT(2) | BIT(3)) +#define DPU_INT_FRM_TIMING_EOF BIT(1) +#define DPU_INT_FRM_TIMING_VSYNC BIT(0) +#define DPU_REST_INT_BITS (DPU_INT_FRM_TIMING_CFG_EOF | \ + DPU_INT_FRM_TIMING_CFG_LINE | \ + DPU_INT_FRM_TIMING_EOF | \ + DPU_INT_CMDLIST_CH_FRM_CFG_DONE) + +#endif
drivers/gpu/drm/spacemit/dpu/saturn_regs/reg_map_hee.h new file +64 -0
64 lines not on this page · raw message
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +298 -0
298 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_dpu_ids.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +*/ + +#ifndef _SPACEMIT_DPU_IDS_H_ +#define _SPACEMIT_DPU_IDS_H_ + +/* Saturn online compositor instance ids (hardware IRQ-table indices). */ +#define COMPOSER0 0 +#define COMPOSER1 1 +#define COMPOSER2 2 +#define COMPOSER3 3 + +/* DPU output-format field encoding (dpuctrl out-format register). */ +#define OUTFMT_RGB121212 0 +#define OUTFMT_RGB101010 1 +#define OUTFMT_RGB888 2 +#define OUTFMT_RGB666 12 +#define OUTFMT_RGB565 13 + +#endif /* _SPACEMIT_DPU_IDS_H_ */
Signature · 1 line
2.43.0
Re: [PATCH v2 07/17] drm/spacemit: add Saturn DPU register model
Quoted 17 lines · 在 2026-08-09日的 21:14 +0800,Cody Kang via B4 Relay写道:
From: Cody Kang <[email protected]>
The Saturn display processing unit is programmed through a set of register blocks (composer, RDMA, timing generator, cmdlist engine, display MMU) laid out identically in both SoC instances. Add the block
address map, the per-field word offset and mask tables consumed by the
field accessors, the interrupt bit layout and the compositor and output-format ID encodings. The address map describes the whole IP block on purpose, including blocks the driver does not touch; the field tables carry the fields the driver programs, with each block's full word count kept as its NWORDS extent.Consumers arrive with the following patches; the driver only becomes buildable once the final patch adds the
KconfigandMakefileglue.
Quoted 7 lines
Signed-off-by Cody Kang <[email protected]>---
v2:
- no change
---
drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h | 25 ++
Is the slightly different K1 Saturn DPU registers considered?
Thanks,
Icenowy
Quoted 481 lines
.../gpu/drm/spacemit/dpu/saturn_regs/reg_map_hee.h | 64 +++++ .../drm/spacemit/dpu/saturn_regs/saturn_fields.h | 298
+++++++++++++++++++++
drivers/gpu/drm/spacemit/spacemit_dpu_ids.h | 22 ++4 files changed, 409 insertions(+)drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h new file +13
-0@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef DPU_INT_REG_H +#define DPU_INT_REG_H + +#include <linux/bits.h> + +#define DPU_INT_CMDLIST_CH_FRM_CFG_DONE_MASK (0xff) +#define
DPU_INT_CMDLIST_CH_FRM_CFG_DONE(DPU_INT_CMDLIST_CH_FRM_CFG_DONE_MASK<<11)drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h new file +7
-0+#define DPU_INT_FRM_TIMING_UNFLOW BIT(8) +#define DPU_INT_CFG_RDY_CLR BIT(5) +#define DPU_INT_FRM_TIMING_CFG_LINE BIT(4) +#define DPU_INT_FRM_TIMING_CFG_EOF (BIT(2) | BIT(3)) +#define DPU_INT_FRM_TIMING_EOF BIT(1) +#define DPU_INT_FRM_TIMING_VSYNC BIT(0) +#define
DPU_REST_INT_BITS(DPU_INT_FRM_TIMING_CFG_EOF| \drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h new file +1
-0+
DPU_INT_FRM_TIMING_CFG_LINE| \drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h new file +1
-0+
DPU_INT_FRM_TIMING_EOF| \drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h new file +1
-0+
DPU_INT_CMDLIST_CH_FRM_CFG_DONE)drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h new file +2
-0+ +#endif drivers/gpu/drm/spacemit/dpu/saturn_regs/reg_map_hee.h new file +56
-0@@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _SATURN_REG_MAP_hee_H_ +#define _SATURN_REG_MAP_hee_H_ + +#include "dpu_int.h" + +/* Base address, then bit definitions */ + +#define DPU_TOP_BASE_ADDR 0x0 +#define DPU_CTRL_BASE_ADDR 0x3c0/* dpu_ctl_top start address */ +#define CMDLIST_BASE_ADDR 0x500 +#define DPU_INT_BASE_ADDR 0x700 + +#define DPU_ONLINE_IRQ_MSK (3 * 4) +#define DPU_ONLINE_IRQ_STS (12 * 4) + +#define DMA_TOP_BASE_ADDR (RDMA0_BASE_ADDR + 0x280) + +#define RDMA0_BASE_ADDR (0x00001000) +#define RDMA1_BASE_ADDR (RDMA0_BASE_ADDR + 0x1000) +#define RDMA2_BASE_ADDR (RDMA0_BASE_ADDR + 0xa000) +#define RDMA3_BASE_ADDR (RDMA0_BASE_ADDR + 0xb000) + +#define MMU_BASE_ADDR (0x1100) +#define MMU_TOP_BASE_ADDR (MMU_BASE_ADDR + 0x100) + +#define TBU0_ADDR 0x1100 +#define TBU1_ADDR 0x1180 +#define TBU2_ADDR 0x2100 +#define TBU3_ADDR 0x2180 +#define TBU4_ADDR 0xb100 +#define TBU5_ADDR 0xb180 +#define TBU6_ADDR 0xc100 +#define TBU7_ADDR 0xc180 + +#define CMP0_BASE_ADDR 0x00018000 +#define CMP1_BASE_ADDR (CMP0_BASE_ADDR + 0x18000) +#define CMP2_BASE_ADDR (CMP0_BASE_ADDR + 0x30000) + +#define PREPIPE_SCAL0_BASE_ADDR 0x14000 +#define PREPIPE_SCAL1_BASE_ADDR 0x14400 +#define PREPIPE_SCAL2_BASE_ADDR 0x14800 +#define PREPIPE_SCAL3_BASE_ADDR 0x14c00 + +#define POST_PIPE_ADDR (CMP1_BASE_ADDR + 0x300) + +#define EE_ADDR (CMP1_BASE_ADDR + 0xd00) + +#define DPU_SCENE_CTL_BASE_ADDR (0x300) +#define DPU_SCENE_CTL_SIZE 0x40 +#define DPU_SCENE_CTL_ADDR (i) (DPU_SCENE_CTL_BASE_ADDR + (i) *
DPU_SCENE_CTL_SIZE)drivers/gpu/drm/spacemit/dpu/saturn_regs/reg_map_hee.h new file +8
-0+ +#define TMG0_BASE_ADDR (0x00051000 + 0x200) + +#define CMDLIST_CH_Y 0x188 +#define CMDLIST_CH_START_CMPS_Y 0x90 +#define CMDLIST_CFG_READY 0x34 + +#endif drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +5
-0@@ -0,0 +1,298 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +* Saturn DPU register field map: word offset and mask per field, consumed by
+ * the dpu_write()/dpu_read() accessors.
+ */drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +9
-0+ +#ifndef SATURN_FIELDS_H +#define SATURN_FIELDS_H + +#include <linux/bits.h> + +/* CMDLIST_REG: 128 x 32-bit registers */ +#define CMDLIST_REG__NWORDS 128 +#define
CMDLIST_REG__cmdlist_reg_0__cmdlist_ch_start_addrl_WORD(i)(0 + (i))
+#defineCMDLIST_REG__cmdlist_reg_0__cmdlist_ch_start_addrl_MASKGENMASK(31,
4)
+#defineCMDLIST_REG__cmdlist_reg_16__cmdlist_ch_start_addrh_WORD(i)(16 +
(i))
+#defineCMDLIST_REG__cmdlist_reg_16__cmdlist_ch_start_addrh_MASKGENMASK(5,
0)
+#defineCMDLIST_REG__cmdlist_reg_48__cmdlist_ch_y_first_WORD(i)(48 + (i))
+#defineCMDLIST_REG__cmdlist_reg_48__cmdlist_ch_y_first_MASKGENMASK(24, 12)drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +119
-0+ +/* CMPS_X_REG: 146 x 32-bit registers */ +#define CMPS_X_REG__NWORDS 146 +#define CMPS_X_REG__module_enable_WORD 0 +#define CMPS_X_REG__module_enable_MASK GENMASK(0, 0) +#define CMPS_X_REG__dst_w_WORD 1 +#define CMPS_X_REG__dst_w_MASK GENMASK(15, 0) +#define CMPS_X_REG__dst_h_WORD 1 +#define CMPS_X_REG__dst_h_MASK GENMASK(31, 16) +#define CMPS_X_REG__bg_color_r_WORD 2 +#define CMPS_X_REG__bg_color_r_MASK GENMASK(9, 0) +#define CMPS_X_REG__bg_color_g_WORD 3 +#define CMPS_X_REG__bg_color_g_MASK GENMASK(9, 0) +#define CMPS_X_REG__bg_color_b_WORD 4 +#define CMPS_X_REG__bg_color_b_MASK GENMASK(9, 0) +#define CMPS_X_REG__bg_color_a_WORD 5 +#define CMPS_X_REG__bg_color_a_MASK GENMASK(7, 0) +#define CMPS_X_REG__layer00_area_left_WORD 8 +#define CMPS_X_REG__layer00_area_left_MASK GENMASK(15, 0) +#define CMPS_X_REG__layer00_area_right_WORD 8 +#define CMPS_X_REG__layer00_area_right_MASK GENMASK(31, 16) +#define CMPS_X_REG__layer00_area_top_WORD 9 +#define CMPS_X_REG__layer00_area_top_MASK GENMASK(15, 0) +#define CMPS_X_REG__layer00_area_bottom_WORD 9 +#define CMPS_X_REG__layer00_area_bottom_MASK GENMASK(31, 16) +#define CMPS_X_REG__layer00_solid_color_r_WORD 10 +#define CMPS_X_REG__layer00_solid_color_r_MASK GENMASK(9, 0) +#define CMPS_X_REG__layer00_solid_color_g_WORD 11 +#define CMPS_X_REG__layer00_solid_color_g_MASK GENMASK(9, 0) +#define CMPS_X_REG__layer00_solid_color_b_WORD 12 +#define CMPS_X_REG__layer00_solid_color_b_MASK GENMASK(9, 0) +#define CMPS_X_REG__layer00_solid_color_a_WORD 13 +#define CMPS_X_REG__layer00_solid_color_a_MASK GENMASK(7, 0) +#define CMPS_X_REG__layer00_blend_mode_WORD 13 +#define CMPS_X_REG__layer00_blend_mode_MASK GENMASK(15, 14) +#define CMPS_X_REG__layer00_colorkey_en_WORD 13 +#define CMPS_X_REG__layer00_colorkey_en_MASK GENMASK(18, 18) +#define CMPS_X_REG__layer00_en_WORD 14 +#define CMPS_X_REG__layer00_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer00_blend_sel_WORD 14 +#define CMPS_X_REG__layer00_blend_sel_MASK GENMASK(2, 1) +#define CMPS_X_REG__layer00_solid_en_WORD 14 +#define CMPS_X_REG__layer00_solid_en_MASK GENMASK(3, 3) +#define CMPS_X_REG__layer00_dma_id_WORD 14 +#define CMPS_X_REG__layer00_dma_id_MASK GENMASK(7, 4) +#define CMPS_X_REG__layer00_layer_alpha_WORD 14 +#define CMPS_X_REG__layer00_layer_alpha_MASK GENMASK(15, 8) +#define CMPS_X_REG__layer00_alpha_ratio_WORD 14 +#define CMPS_X_REG__layer00_alpha_ratio_MASK GENMASK(23, 16) +#define CMPS_X_REG__layer01_en_WORD 21 +#define CMPS_X_REG__layer01_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer02_en_WORD 28 +#define CMPS_X_REG__layer02_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer03_en_WORD 35 +#define CMPS_X_REG__layer03_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer04_en_WORD 42 +#define CMPS_X_REG__layer04_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer05_en_WORD 49 +#define CMPS_X_REG__layer05_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer06_en_WORD 56 +#define CMPS_X_REG__layer06_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer07_en_WORD 63 +#define CMPS_X_REG__layer07_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer08_en_WORD 70 +#define CMPS_X_REG__layer08_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer09_en_WORD 77 +#define CMPS_X_REG__layer09_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer10_en_WORD 84 +#define CMPS_X_REG__layer10_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer11_en_WORD 91 +#define CMPS_X_REG__layer11_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer12_en_WORD 98 +#define CMPS_X_REG__layer12_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer13_en_WORD 105 +#define CMPS_X_REG__layer13_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer14_en_WORD 112 +#define CMPS_X_REG__layer14_en_MASK GENMASK(0, 0) +#define CMPS_X_REG__layer15_en_WORD 119 +#define CMPS_X_REG__layer15_en_MASK GENMASK(0, 0) + +/* DMA_TOP_REG: 25 x 32-bit registers */ +#define DMA_TOP_REG__NWORDS 25 +#define DMA_TOP_REG__image_rr_ratio_WORD 1 +#define DMA_TOP_REG__image_rr_ratio_MASK GENMASK(7, 0) +#define DMA_TOP_REG__pixel_num_th_WORD 1 +#define DMA_TOP_REG__pixel_num_th_MASK GENMASK(14, 9) +#define DMA_TOP_REG__rdma_timeout_limit_WORD 2 +#define DMA_TOP_REG__rdma_timeout_limit_MASK GENMASK(15, 0) +#define DMA_TOP_REG__wdma_timeout_limit_WORD 2 +#define DMA_TOP_REG__wdma_timeout_limit_MASK GENMASK(31, 16) + +/* DPU_CTL_REG: 15 x 32-bit registers */ +#define DPU_CTL_REG__NWORDS 15 +#define DPU_CTL_REG__nml_rch_en_WORD 0 +#define DPU_CTL_REG__nml_rch_en_MASK GENMASK(9, 0) +#define DPU_CTL_REG__nml_scl_en_WORD 0 +#define DPU_CTL_REG__nml_scl_en_MASK GENMASK(13, 10) +#define DPU_CTL_REG__nml_outctl_en_WORD 0 +#define DPU_CTL_REG__nml_outctl_en_MASK GENMASK(18, 18) +#define DPU_CTL_REG__nml_frm_timing_en_WORD 0 +#define DPU_CTL_REG__nml_frm_timing_en_MASK GENMASK(25, 23) +#define DPU_CTL_REG__both_cfg_rdy_WORD 2 +#define DPU_CTL_REG__both_cfg_rdy_MASK GENMASK(0, 0) +#define DPU_CTL_REG__video_mod_WORD 3 +#define DPU_CTL_REG__video_mod_MASK GENMASK(0, 0) +#define DPU_CTL_REG__dbg_mod_WORD 3 +#define DPU_CTL_REG__dbg_mod_MASK GENMASK(1, 1) +#define DPU_CTL_REG__timing_inter0_WORD 3 +#define DPU_CTL_REG__timing_inter0_MASK GENMASK(7, 2) +#define DPU_CTL_REG__timing_inter1_WORD 3 +#define DPU_CTL_REG__timing_inter1_MASK GENMASK(13, 8) +#define DPU_CTL_REG__sw_start_WORD 4 +#define DPU_CTL_REG__sw_start_MASK GENMASK(0, 0) +#define DPU_CTL_REG__nml_rch_vrt_reuse_WORD 7 +#define DPU_CTL_REG__nml_rch_vrt_reuse_MASK GENMASK(9, 0) + +/* DPU_CTL_TOP_REG: 53 x 32-bit registers */ +#define DPU_CTL_TOP_REG__NWORDS 53 +#define
DPU_CTL_TOP_REG__dpu_ctl_top_reg_0__cmdlist_rch_en_WORD(i)(0 + (i))
+#defineDPU_CTL_TOP_REG__dpu_ctl_top_reg_0__cmdlist_rch_en_MASKGENMASK(0, 0)
+#defineDPU_CTL_TOP_REG__dpu_ctl_top_reg_10__cmdlist_cmps_other_en_WORD(i)(10 + (i))+#define
DPU_CTL_TOP_REG__dpu_ctl_top_reg_10__cmdlist_cmps_other_en_MASKGENMASK(0, 0)
+#defineDPU_CTL_TOP_REG__dpu_ctl_top_reg_10__cmdlist_cmps_top_en_WORD(i)(10 + (i))+#define
DPU_CTL_TOP_REG__dpu_ctl_top_reg_10__cmdlist_cmps_top_en_MASKGENMASK(1, 1)drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +44
-0+ +/* DPU_INTP_REG: 50 x 32-bit registers */ +#define DPU_INTP_REG__NWORDS 50 + +/* EE_REG: 51 x 32-bit registers */ +#define EE_REG__NWORDS 51 +#define EE_REG__m_benable_WORD 0 +#define EE_REG__m_benable_MASK GENMASK(0, 0) + +/* MMU_TBU_REG: 21 x 32-bit registers */ +#define MMU_TBU_REG__NWORDS 21 +#define MMU_TBU_REG__tbu_base_addr0_low_WORD 1 +#define MMU_TBU_REG__tbu_base_addr0_low_MASK GENMASK(31, 0) +#define MMU_TBU_REG__tbu_base_addr0_high_WORD 2 +#define MMU_TBU_REG__tbu_base_addr0_high_MASK GENMASK(11, 0) +#define MMU_TBU_REG__tbu_base_addr1_low_WORD 3 +#define MMU_TBU_REG__tbu_base_addr1_low_MASK GENMASK(31, 0) +#define MMU_TBU_REG__tbu_base_addr1_high_WORD 4 +#define MMU_TBU_REG__tbu_base_addr1_high_MASK GENMASK(11, 0) +#define MMU_TBU_REG__tbu_base_addr2_low_WORD 5 +#define MMU_TBU_REG__tbu_base_addr2_low_MASK GENMASK(31, 0) +#define MMU_TBU_REG__tbu_base_addr2_high_WORD 6 +#define MMU_TBU_REG__tbu_base_addr2_high_MASK GENMASK(11, 0) +#define MMU_TBU_REG__tbu_va0_WORD 7 +#define MMU_TBU_REG__tbu_va0_MASK GENMASK(31, 0) +#define MMU_TBU_REG__tbu_va1_WORD 8 +#define MMU_TBU_REG__tbu_va1_MASK GENMASK(31, 0) +#define MMU_TBU_REG__tbu_va2_WORD 9 +#define MMU_TBU_REG__tbu_va2_MASK GENMASK(31, 0) +#define MMU_TBU_REG__tbu_size0_WORD 10 +#define MMU_TBU_REG__tbu_size0_MASK GENMASK(15, 0) +#define MMU_TBU_REG__tbu_size1_WORD 11 +#define MMU_TBU_REG__tbu_size1_MASK GENMASK(15, 0) +#define MMU_TBU_REG__tbu_size2_WORD 12 +#define MMU_TBU_REG__tbu_size2_MASK GENMASK(15, 0) +#define MMU_TBU_REG__vsync_update_en_WORD 13 +#define MMU_TBU_REG__vsync_update_en_MASK GENMASK(1, 1) + +/* MMU_TOP_REG: 23 x 32-bit registers */ +#define MMU_TOP_REG__NWORDS 23 +#define MMU_TOP_REG__rdma_timelimit_WORD 0 +#define MMU_TOP_REG__rdma_timelimit_MASK GENMASK(31, 16) +#define MMU_TOP_REG__sram0_tlb_axi_port_sel_WORD 1 +#define MMU_TOP_REG__sram0_tlb_axi_port_sel_MASK GENMASK(1,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define MMU_TOP_REG__sram1_tlb_axi_port_sel_WORD 1 +#define MMU_TOP_REG__sram1_tlb_axi_port_sel_MASK GENMASK(3,2)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +24
-0+#define MMU_TOP_REG__dmac0_rd_outs_num_WORD 2 +#define MMU_TOP_REG__dmac0_rd_outs_num_MASK GENMASK(7, 0) +#define MMU_TOP_REG__dmac1_rd_outs_num_WORD 3 +#define MMU_TOP_REG__dmac1_rd_outs_num_MASK GENMASK(7, 0) + +/* POSTPIPE_REG: 50 x 32-bit registers */ +#define POSTPIPE_REG__NWORDS 50 +#define POSTPIPE_REG__m_inwidth_WORD 13 +#define POSTPIPE_REG__m_inwidth_MASK GENMASK(15, 0) +#define POSTPIPE_REG__m_inheight_WORD 13 +#define POSTPIPE_REG__m_inheight_MASK GENMASK(31, 16) + +/* RDMA_PATH_X_REG: 60 x 32-bit registers */ +#define RDMA_PATH_X_REG__NWORDS 60 +#define RDMA_PATH_X_REG__layer_mode_WORD 0 +#define RDMA_PATH_X_REG__layer_mode_MASK GENMASK(1, 0) +#define RDMA_PATH_X_REG__layer_cmpsr_id_WORD 0 +#define RDMA_PATH_X_REG__layer_cmpsr_id_MASK GENMASK(15, 13) +#define RDMA_PATH_X_REG__is_two_layers_WORD 1 +#define RDMA_PATH_X_REG__is_two_layers_MASK GENMASK(0, 0) +#define RDMA_PATH_X_REG__is_offline_WORD 1 +#define RDMA_PATH_X_REG__is_offline_MASK GENMASK(1, 1) +#define RDMA_PATH_X_REG__base_addr0_low_ly0_WORD 9 +#define RDMA_PATH_X_REG__base_addr0_low_ly0_MASK GENMASK(31,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define RDMA_PATH_X_REG__base_addr0_high_ly0_WORD 10 +#define RDMA_PATH_X_REG__base_addr0_high_ly0_MASK GENMASK(1,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define RDMA_PATH_X_REG__base_addr1_low_ly0_WORD 11 +#define RDMA_PATH_X_REG__base_addr1_low_ly0_MASK GENMASK(31,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define RDMA_PATH_X_REG__base_addr1_high_ly0_WORD 12 +#define RDMA_PATH_X_REG__base_addr1_high_ly0_MASK GENMASK(1,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define RDMA_PATH_X_REG__base_addr2_low_ly0_WORD 13 +#define RDMA_PATH_X_REG__base_addr2_low_ly0_MASK GENMASK(31,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define RDMA_PATH_X_REG__base_addr2_high_ly0_WORD 14 +#define RDMA_PATH_X_REG__base_addr2_high_ly0_MASK GENMASK(1,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define RDMA_PATH_X_REG__rdma_stride0_layer0_WORD 15 +#define RDMA_PATH_X_REG__rdma_stride0_layer0_MASK GENMASK(15,0)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +2
-0+#define RDMA_PATH_X_REG__rdma_stride1_layer0_WORD 15 +#define RDMA_PATH_X_REG__rdma_stride1_layer0_MASK GENMASK(31,16)
drivers/gpu/drm/spacemit/dpu/saturn_regs/saturn_fields.h new file +69
-0+#define RDMA_PATH_X_REG__img_width_ly0_WORD 16 +#define RDMA_PATH_X_REG__img_width_ly0_MASK GENMASK(15, 0) +#define RDMA_PATH_X_REG__img_height_ly0_WORD 16 +#define RDMA_PATH_X_REG__img_height_ly0_MASK GENMASK(31, 16) +#define RDMA_PATH_X_REG__bbox_start_x_ly0_WORD 17 +#define RDMA_PATH_X_REG__bbox_start_x_ly0_MASK GENMASK(15, 0) +#define RDMA_PATH_X_REG__bbox_start_y_ly0_WORD 17 +#define RDMA_PATH_X_REG__bbox_start_y_ly0_MASK GENMASK(31, 16) +#define RDMA_PATH_X_REG__bbox_end_x_ly0_WORD 18 +#define RDMA_PATH_X_REG__bbox_end_x_ly0_MASK GENMASK(15, 0) +#define RDMA_PATH_X_REG__bbox_end_y_ly0_WORD 18 +#define RDMA_PATH_X_REG__bbox_end_y_ly0_MASK GENMASK(31, 16) +#define RDMA_PATH_X_REG__pixel_format_WORD 29 +#define RDMA_PATH_X_REG__pixel_format_MASK GENMASK(5, 0) +#define RDMA_PATH_X_REG__uv_swap_WORD 29 +#define RDMA_PATH_X_REG__uv_swap_MASK GENMASK(6, 6) +#define RDMA_PATH_X_REG__rot_mode_ly0_WORD 29 +#define RDMA_PATH_X_REG__rot_mode_ly0_MASK GENMASK(10, 8) + +/* TMG_REG: 30 x 32-bit registers */ +#define TMG_REG__NWORDS 30 +#define TMG_REG__split_en_WORD 0 +#define TMG_REG__split_en_MASK GENMASK(0, 0) +#define TMG_REG__cmd_screen_WORD 0 +#define TMG_REG__cmd_screen_MASK GENMASK(1, 1) +#define TMG_REG__fm_timing_en_WORD 0 +#define TMG_REG__fm_timing_en_MASK GENMASK(2, 2) +#define TMG_REG__cmd_wait_en_WORD 0 +#define TMG_REG__cmd_wait_en_MASK GENMASK(3, 3) +#define TMG_REG__cmd_wait_te_WORD 0 +#define TMG_REG__cmd_wait_te_MASK GENMASK(4, 4) +#define TMG_REG__disp_ready_man_en_WORD 0 +#define TMG_REG__disp_ready_man_en_MASK GENMASK(5, 5) +#define TMG_REG__hsp_WORD 0 +#define TMG_REG__hsp_MASK GENMASK(7, 7) +#define TMG_REG__vsp_WORD 0 +#define TMG_REG__vsp_MASK GENMASK(8, 8) +#define TMG_REG__user_WORD 2 +#define TMG_REG__user_MASK GENMASK(15, 12) +#define TMG_REG__hfp_WORD 3 +#define TMG_REG__hfp_MASK GENMASK(27, 16) +#define TMG_REG__hsync_width_WORD 4 +#define TMG_REG__hsync_width_MASK GENMASK(9, 0) +#define TMG_REG__hbp_WORD 4 +#define TMG_REG__hbp_MASK GENMASK(27, 16) +#define TMG_REG__vfp_WORD 5 +#define TMG_REG__vfp_MASK GENMASK(15, 0) +#define TMG_REG__vsync_width_WORD 5 +#define TMG_REG__vsync_width_MASK GENMASK(25, 16) +#define TMG_REG__vbp_WORD 6 +#define TMG_REG__vbp_MASK GENMASK(11, 0) +#define TMG_REG__h_active_WORD 6 +#define TMG_REG__h_active_MASK GENMASK(29, 16) +#define TMG_REG__v_active_WORD 7 +#define TMG_REG__v_active_MASK GENMASK(13, 0) +#define TMG_REG__background_r_WORD 9 +#define TMG_REG__background_r_MASK GENMASK(11, 0) +#define TMG_REG__background_g_WORD 9 +#define TMG_REG__background_g_MASK GENMASK(27, 16) +#define TMG_REG__background_b_WORD 10 +#define TMG_REG__background_b_MASK GENMASK(11, 0) +#define TMG_REG__eof_1st_ln_dly_num_WORD 11 +#define TMG_REG__eof_1st_ln_dly_num_MASK GENMASK(15, 0) +#define TMG_REG__eof_2nd_ln_dly_num_WORD 11 +#define TMG_REG__eof_2nd_ln_dly_num_MASK GENMASK(31, 16) +#define TMG_REG__sof_pre_ln_num_WORD 14 +#define TMG_REG__sof_pre_ln_num_MASK GENMASK(16, 0) + +#endif /* SATURN_FIELDS_H */ drivers/gpu/drm/spacemit/spacemit_dpu_ids.h new file +9
-0@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +*/ + +#ifndef _SPACEMIT_DPU_IDS_H_ +#define _SPACEMIT_DPU_IDS_H_ + +/* Saturn online compositor instance ids (hardware IRQ-table indices). */
drivers/gpu/drm/spacemit/spacemit_dpu_ids.h new file +6
-0+#define COMPOSER0 0 +#define COMPOSER1 1 +#define COMPOSER2 2 +#define COMPOSER3 3 + +/* DPU output-format field encoding (dpuctrl out-format register). */
drivers/gpu/drm/spacemit/spacemit_dpu_ids.h new file +7
-0+#define OUTFMT_RGB121212 0 +#define OUTFMT_RGB101010 1 +#define OUTFMT_RGB888 2 +#define OUTFMT_RGB666 12 +#define OUTFMT_RGB565 13 + +#endif /* _SPACEMIT_DPU_IDS_H_ */
Re: [PATCH v2 07/17] drm/spacemit: add Saturn DPU register model
Hi Icenowy,
Quoted 4 lines · Icenowy Zheng
Quoted 1 line · 在 2026-08-09日的 21:14 +0800,Cody Kang via B4 Relay写道:
drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h | 25 ++
Is the slightly different K1 Saturn DPU registers considered?
I compared them with the K1 BSP you mentioned offline [1]. Judging by the block, field and interrupt macro names, I agree with you that the K1 and the K3 use similar IP. But there are also important differences between the K1 and K3 registers, which is why I would not propose reusing these tables.
For example, the blocks sit at different addresses, and most fields are at a different word or bit. In dpu_int.h, CFG_RDY_CLR is bit 4 on the K1 and bit 5 on the K3, and the underrun bit is 9 and 8.
IMHO a K1 port should add its own compatible, its own field header and its own backend file next to the K3 ones. What do you think? Hopefully you agree with me.
[1] https://github.com/spacemit-com/linux-6.6/tree/k1-bl-v2.2.y/drivers/gpu/drm/spacemit/dpu/saturn_regs
Guodong
Re: [PATCH v2 07/17] drm/spacemit: add Saturn DPU register model
Quoted 14 lines · 在 2026-11-17二的 16:48 -0500,Guodong Xu写道:
Hi Icenowy,
Quoted 4 lines · Icenowy Zheng
Quoted 1 line · 在 2026-08-09日的 21:14 +0800,Cody Kang via B4 Relay写道:
drivers/gpu/drm/spacemit/dpu/saturn_regs/dpu_int.h | 25 ++
Is the slightly different K1 Saturn DPU registers considered?
I compared them with the K1 BSP you mentioned offline [1]. Judging by the block, field and interrupt macro names, I agree with you that the K1 and the K3 use similar IP. But there are also important differences between the K1 and K3 registers, which is why I would not propose reusing these tables.
Quoted 3 lines
For example, the blocks sit at different addresses, and most fields are at a different word or bit. In
dpu_int.h,CFG_RDY_CLRis bit 4 on the K1 and bit 5 on the K3, and the underrun bit is 9 and 8.
Yes, this IP weirdly doesn't consider register map compatiblity at all.
Quoted 2 lines
IMHO a K1 port should add its own compatible, its own field header
Well I don't think field headers would work for a mainlined driver; maybe things like regmap_field could be used to mitigate the difference.
Surely a compatible string for K1 would be needed, and it might then set a device info structure as match data, containing the device capability and regmap_field list.
Thanks,
Icenowy
Quoted 7 lines
and its own backend file next to the K3 ones. What do you think? Hopefully you agree with me.
[1]
https://github.com/spacemit-com/linux-6.6/tree/k1-bl-v2.2.y/drivers/gpu/drm/spacemit/dpu/saturn_regsGuodong
Re: [PATCH v2 07/17] drm/spacemit: add Saturn DPU register model
Hi Icenowy,
Quoted 6 lines · Icenowy Zheng
Quoted 3 lines · 在 2026-11-17二的 16:48 -0500,Guodong Xu写道:
For example, the blocks sit at different addresses, and most fields are at a different word or bit. In
dpu_int.h,CFG_RDY_CLRis bit 4 on the K1 and bit 5 on the K3, and the underrun bit is 9 and 8.Yes, this IP weirdly doesn't consider register map compatiblity at all.
Exactly.
Quoted 5 lines
Quoted 1 line
IMHO a K1 port should add its own compatible, its own field header
Well I don't think field headers would work for a mainlined driver; maybe things like
regmap_fieldcould be used to mitigate the difference.
Fair point, but maybe that can be done when the K1 is added. For now, in this series, let's make sure the field header and its users are self-contained, so that K1 support is easier to add later.
Guodong
PATCH v2 8/17 drm/spacemit: add Saturn DPU core types, cmdlist and display MMU
In reply to Cody KangRegister programming of the Saturn DPU is batched: the driver builds per-module register lists in memory and the hardware command-list engine replays them at frame boundaries, while scanout buffers are mapped through the DPU's private address translation unit (DMMU) rather than scanned out by physical address.
Add the shared driver types, the MMIO field accessors, the trace events, the command-list builder and the DMMU table code. Some DPU configuration registers are write-only, so a read-modify-write would corrupt neighbouring fields; byte- and halfword-aligned fields are therefore written at their native width instead.
---
v2:
- hold the DPU reset lines as one reset_control_bulk_data pipe_resets[5] array in spacemit_drm_private and drop the pointers duplicated into struct spacemit_crtc (Philipp Zabel)
- drop the INT_VSYNC_UPDATE enum member; it never had an irq_list[] mapping and the register model has no such status bit (Sashiko)
- drop the unreachable multi-planar arms in spacemit_dmmu_map(); every advertised format is single-planar (Sashiko)
- drop the unused cmdlist parameter from the crtc_cmdlist op (Sashiko)
--- drivers/gpu/drm/spacemit/dpu/dpu_saturn.h | 35 +++ drivers/gpu/drm/spacemit/dpu/dpu_trace.h | 350 ++++++++++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_cmdlist.c | 304 ++++++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_cmdlist.h | 146 ++++++++++++ drivers/gpu/drm/spacemit/spacemit_crtc.h | 246 +++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_dmmu.c | 80 +++++++ drivers/gpu/drm/spacemit/spacemit_dmmu.h | 40 ++++ drivers/gpu/drm/spacemit/spacemit_dpu_reg.h | 108 +++++++++ drivers/gpu/drm/spacemit/spacemit_drm.h | 61 +++++ 9 files changed, 1370 insertions(+)
drivers/gpu/drm/spacemit/dpu/dpu_saturn.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _DPU_SATURN_H_ +#define _DPU_SATURN_H_ + +#include "../spacemit_crtc.h" + +struct dpu_format_id { +u32 format;/* DRM fourcc */ +u8 id; +u8 bpp;/* bits per pixel */ +}; + +#define SPACEMIT_DPU_INVALID_FORMAT_ID 0xff + +enum format_features { +FORMAT_RGB =BIT (0 ), +}; + +struct spacemit_hw_rdma { +u16 formats; +}; + +int dpu_parse_clocks (struct device *dev,struct dpu_clk_context *clk_ctx); +u8 spacemit_plane_hw_get_format_id (u32 format); +u32 saturn_conf_dpuctrl_rdma (struct spacemit_crtc *a_crtc); +extern const struct spacemit_hw_device k3_saturn_dpu; +void saturn_enable_irq_mask (struct spacemit_crtc *a_crtc,bool enable, +u32 offset,u32 mask); +void spacemit_cfg_rdy_timer_handler (struct timer_list *t); +#endif
drivers/gpu/drm/spacemit/dpu/dpu_trace.h new file +350 -0
350 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +304 -0
304 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_cmdlist.h new file +146 -0
146 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_crtc.h new file +246 -0
246 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +80 -0
80 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_dmmu.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _SPACEMIT_DMMU_H_ +#define _SPACEMIT_DMMU_H_ + +#include <linux/types.h> + +#include <drm/drm_file.h> +#include "spacemit_cmdlist.h" + +#define DPU_QOS_URGENT 4 +#define DPU_QOS_NORMAL 3 +#define DPU_QOS_LOW 2 +/* Worst-case TLB alignment over-fetch at the maximum 4096 src_x. */ +#define HW_ALIGN_TTB_NUM 60 + +#define RD_OUTS_NUM 16 +#define RDMA_TIMELIMIT 0xFFFF + +#define BASE_VA 0x10000000ULL +#define VA_STEP_PER_TBU 0x40000000ULL + +#define TBU_BASE_VA (tbu_id) ((u64)BASE_VA + (u64)VA_STEP_PER_TBU * (tbu_id)) + +struct tbu_instance { +u64 ttb_pa[3 ]; +u64 tbu_va[3 ]; +u32 ttb_size[3 ]; +}; + +struct dpu_mmu_tbl ; +int spacemit_dmmu_map (struct drm_framebuffer *fb,struct dpu_mmu_tbl *mmu_tbl, +u8 tbu_id,struct cmdlist_regs *cl_rdma, +struct drm_plane *plane); + +#endif /* _SPACEMIT_DMMU_H_ */
drivers/gpu/drm/spacemit/spacemit_dpu_reg.h new file +108 -0
108 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_drm.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 08/17] drm/spacemit: add Saturn DPU core types, cmdlist and display MMU
Thank you for your contribution! Sashiko AI review found 10 potential issue(s) to consider: - [Critical] Modifying the command list of unmodified planes during CRTC commits leads to unbounded growth…
Thank you for your contribution! Sashiko AI review found 10 potential issue(s) to consider:
- [Critical] Modifying the command list of unmodified planes during CRTC commits leads to unbounded growth of cl->nod_len and DMA buffer overflow.
- [High] Command list DMA buffers are embedded in transient atomic states, leading to lifecycle conflicts and shared buffer corruption.
- [High] Unconditional dereference of priv->cmdlist_groups[i] leads to a NULL pointer dereference in cmdlist_atomic_commit.
- [High] Directly accessing plane->state and crtc->state during atomic commits creates TOCTOU races with subsequent non-blocking commits.
- [High] Hardware DMMU reads out of bounds if the page table entries exceed the pre-allocated buffer size limit.
- [High] NULL pointer dereference on fb in the dpu_plane_info tracepoint.
- [High] Potential NULL pointer dereference of a_crtc->crtc.dev in cmdlist_regs_packing if a plane is being disabled.
- [High] Calling spacemit_dmmu_map sleeps in an atomic context and introduces data races on the command list.
- [Medium] Unprotected read-modify-write on MMIO registers in the __dpu_mmio_field_write macro.
- [Medium] Unvalidated rdma_id is used directly as an array index, leading to out-of-bounds writes.
--
--- Patch [8]: [PATCH v2 08/17] drm/spacemit: add Saturn DPU core types, cmdlist and display MMU --- commit 4c661acb763f61ae82caefcc3ef85c607c0b6ffe
Author: Cody Kang <[email protected]>
drm/spacemit: add Saturn DPU core types, cmdlist and display MMU
Register programming of the Saturn DPU is batched: the driver builds per-module register lists in memory and the hardware command-list engine replays them at frame boundaries, while scanout buffers are mapped through the DPU's private address translation unit (DMMU) rather than scanned out by physical address.
Quoted 4 lines
drivers/gpu/drm/spacemit/dpu/dpu_trace.h new file +0
-0
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_trace.h line 82
Quoted 13 lines
drivers/gpu/drm/spacemit/dpu/dpu_trace.h new file +13
-0+TP_fast_assign ( + __entry->rdma_id = rdma_id; + __entry->src_w = state->src_w >>16 ; + __entry->src_h = state->src_h >>16 ; + __entry->src_x = state->src_x >>16 ; + __entry->src_y = state->src_y >>16 ; + __entry->crtc_w = state->crtc_w; + __entry->crtc_h = state->crtc_h; + __entry->crtc_x = state->crtc_x; + __entry->crtc_y = state->crtc_y; + __entry->width = fb->width; + __entry->height = fb->height; + __entry->format = fb->format->format;
[Severity: High]
Is it possible for fb to be NULL here?
During a plane disable operation in the DRM atomic framework, the plane state will have a NULL framebuffer. Would this tracepoint cause a NULL pointer dereference when capturing these fields?
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +0
-0
[ ... ]
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +3
-0+void cmdlist_regs_packing (struct cmdlist *cl,enum cmdlist_mode_type mod, +struct cmdlist_regs *cl_regs) +{
[ ... ]
drivers/gpu/drm/spacemit/spacemit_cmdlist.c line 103
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +7
-0+if (cl->type ==CMDLIST_PLANE ) { +struct spacemit_plane_state *spacemit_pstate = +cl_to_spacemit_pstate (cl); + + a_crtc =to_spacemit_crtc (spacemit_pstate->state.crtc); + + drm_dbg(a_crtc->crtc.dev, "rch_id = %d, ch_y = %u\n",
[Severity: High]
When a plane is disabled, its state.crtc is set to NULL. Could a_crtc end up being NULL here, leading to a dereference when accessing a_crtc->crtc.dev for logging?
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +3
-0+ spacemit_pstate->rdma_id, + spacemit_pstate->state.crtc_y); + }else if (cl->type ==CMDLIST_CRTC ) {
[ ... ]
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +4
-0+void cmdlist_sort_by_group (struct drm_crtc *crtc) +{ +struct cmdlist *first_cl; +struct cmdlist *last_cl;
drivers/gpu/drm/spacemit/spacemit_cmdlist.c line 175
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +10
-0+struct cmdlist *p; +struct cmdlist *prev; +struct drm_plane *plane; +struct spacemit_crtc_rdma *rdmas = +to_spacemit_crtc_state (crtc->state)->rdmas; +struct spacemit_drm_private *priv = crtc->dev->dev_private; + +drm_atomic_crtc_for_each_plane (plane, crtc) { +struct spacemit_plane_state *spacemit_pstate = +to_spacemit_plane_state (plane->state);
[Severity: High]
Does directly accessing the current plane->state create a TOCTOU race with subsequent non-blocking commits?
In asynchronous commit tails, the DRM core swaps these pointers. Using plane->state directly instead of the passed drm_atomic_state might result in reading uncommitted state.
drivers/gpu/drm/spacemit/spacemit_cmdlist.c line 183
Quoted 8 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +8
-0+u32 rdma_id = spacemit_pstate->rdma_id; + + first_cl = &spacemit_pstate->cl; +if (!first_cl->va) +continue ; + + last_cl = first_cl; + last_cl->next =NULL ;
[Severity: Critical]
What happens to the command list of unmodified planes during CRTC commits?
It looks like we mutate last_cl->next for all active planes, even those not modified by the current commit. Later in cmdlist_atomic_commit(), cmdlist_fill_conf_row() appends configuration rows to it. Since the plane state isn't duplicated, does cl->nod_len grow unboundedly on every update until it overflows the fixed DMA buffer?
drivers/gpu/drm/spacemit/spacemit_cmdlist.c line 186
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +3
-0+ + rdmas[rdma_id].in_use = true; +if (priv->cmdlist_groups[rdma_id]) {
[Severity: Medium]
Is there a guarantee that rdma_id is within bounds?
We are using it as an index into rdmas[] and priv->cmdlist_groups[] without validating it against the hardware limit (hwdev->rdma_nums) or checking for RDMA_INVALID_ID.
[ ... ]
drivers/gpu/drm/spacemit/spacemit_cmdlist.c line 221
Quoted 11 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +11
-0+void cmdlist_atomic_commit (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +int i; +struct cmdlist *cur_cl, *first_cl; +struct spacemit_crtc *a_crtc =NULL ; +u32 chy, addrl, addrh; +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct spacemit_crtc_rdma *cur_rdmas = +to_spacemit_crtc_state (crtc->state)->rdmas;
[Severity: High]
Similar to the plane state access earlier, does accessing crtc->state directly create a race condition with asynchronous commits?
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +10
-0+struct spacemit_crtc_rdma *old_rdmas = +to_spacemit_crtc_state (old_state)->rdmas; + + a_crtc =to_spacemit_crtc (crtc); + +for (i =0 ; i < hwdev->rdma_nums; i++) { +if (old_rdmas[i].in_use) + hwdev->enable_cmdlist (a_crtc, hwdev, i, false); + +if (cur_rdmas[i].in_use) {
drivers/gpu/drm/spacemit/spacemit_cmdlist.c line 241
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +10
-0+drm_dbg (crtc->dev,"cmdlist group = %d\n" , i); + cur_cl = priv->cmdlist_groups[i]; + first_cl = cur_cl; +while (cur_cl) { + hwdev->cmdlist_fill_conf_row (cur_cl, hwdev, +CMDLIST_CMP_INVALID ); +cmdlist_dump_node (cur_cl); + cur_cl = cur_cl->next; + } + chy =cl_to_spacemit_pstate (first_cl)->state.crtc_y;
[Severity: High]
If cmdlist_sort_by_group() skips populating priv->cmdlist_groups[i] because first_cl->va was NULL, but cur_rdmas[i].in_use remains true (inherited from the old state before disabling), could cur_cl become NULL?
If so, this would lead to a NULL pointer dereference when accessing first_cl or priv->cmdlist_groups[i]->pa just below.
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +2
-0+ addrl = (lower_32_bits (priv->cmdlist_groups[i]->pa) & +CMDLIST_ADDRL_ALIGN_MASK ) >>CMDLIST_ADDRL_ALIGN_BITS ;
[ ... ]
drivers/gpu/drm/spacemit/spacemit_cmdlist.c line 299
Quoted 8 lines
drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +8
-0+int spacemit_cmdlist_alloc (struct device *dev,struct cmdlist *cl) +{ +if (cl->va) +return 0 ; + + cl->size =PER_CMDLIST_SIZE ; + cl->va =dma_alloc_coherent (dev, cl->size, &cl->pa, +GFP_KERNEL | __GFP_ZERO);
[Severity: High]
Should the command list DMA buffer be embedded directly in the transient plane state?
By skipping allocation when cl->va is non-NULL, duplicating plane states results in a shallow copy where all states share the same physical DMA buffer. Mutating this buffer during a new atomic commit might overwrite the command list actively being scanned out by the hardware.
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +0
-0
[ ... ]
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +4
-0+static inline void spacemit_dmmu_fill_pgtable (struct dpu_mmu_tbl *tbl, +struct sg_table *sgt) +{ +struct sg_dma_page_iter dma_iter;
drivers/gpu/drm/spacemit/spacemit_dmmu.c line 32
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +10
-0+u32 max_entries = tbl->size /4 ; +u32 *ttbr = tbl->va; +u32 i =0 , n =0 , temp =0 ; + +for_each_sgtable_dma_page (sgt, &dma_iter,0 ) { +/* +* atomic_check sized the table off this same fb; catch a drift +*/ +if (WARN_ON_ONCE (n +HW_ALIGN_TTB_NUM >= max_entries)) +break ;
[Severity: High]
If we hit this WARN_ON_ONCE and break early, we don't communicate the truncated size back to the caller.
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +2
-0+ ttbr[n++] = (sg_page_iter_dma_address (&dma_iter) >>PAGE_SHIFT ) &0x3FFFFFF ; + }
[ ... ]
drivers/gpu/drm/spacemit/spacemit_dmmu.c line 58
Quoted 11 lines
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +11
-0+int spacemit_dmmu_map (struct drm_framebuffer *fb,struct dpu_mmu_tbl *mmu_tbl, +u8 tbu_id,struct cmdlist_regs *cl_rdma, +struct drm_plane *plane) +{ +struct spacemit_drm_private *priv = fb->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct sg_table *sgt =NULL ; +struct tbu_instance tbu = { }; +u32 val; + + sgt =drm_gem_shmem_get_pages_sgt (to_drm_gem_shmem_obj (fb->obj[0 ]));
[Severity: High]
Is it safe to call this here?
drm_gem_shmem_get_pages_sgt() performs a sleepable allocation (GFP_KERNEL) and acquires a mutex. If called during atomic_update (the standard hardware programming phase), it sleeps in an atomic context.
If called during prepare_fb to avoid the atomic context, does mutating the cl_rdma buffer below introduce data races with the hardware processing the previous frame?
drivers/gpu/drm/spacemit/spacemit_dmmu.c line 65
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +7
-0+if (IS_ERR (sgt)) +return PTR_ERR (sgt); + +/* Every advertised format is single-planar */ + tbu.ttb_pa[0 ] = mmu_tbl->pa; + tbu.tbu_va[0 ] =TBU_BASE_VA (tbu_id); + tbu.ttb_size[0 ] =roundup (fb->obj[0 ]->size,PAGE_SIZE ) >>PAGE_SHIFT ;
[Severity: High]
Since tbu.ttb_size[0] is programmed to the full FB size regardless of whether spacemit_dmmu_fill_pgtable() truncated the table, could this cause the hardware DMMU to read out of bounds past the physical allocation of mmu_tbl?
Quoted 17 lines
drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +12
-0+ +spacemit_dmmu_fill_pgtable (mmu_tbl, sgt); + +/* +* enable = 1, fbc_mode = 0 (linear only) +* single plane in bits [3:2] +*/ + val =0x1 ; +/* tbu_burst_limit_en = 1, tlb_fetch_active_en = 1 */ + val |=BIT (4 ) |BIT (5 ); + val = val | (DPU_QOS_URGENT <<8 ); + hwdev->rdma_dmmu (hwdev, tbu_id, &tbu, fb, val, cl_rdma, plane);drivers/gpu/drm/spacemit/spacemit_dpu_reg.h new file +0
-0
[ ... ]
Quoted 9 lines
drivers/gpu/drm/spacemit/spacemit_dpu_reg.h new file +9
-0+#define __dpu_mmio_field_write (__addr, __mask, data) \ +do { \ + if ((__mask) == 0xffU) \ + writeb((u8)((data) & 0xffU), __addr); \ + else if ((__mask) == 0xff00U) \ + writeb((u8)((data) & 0xffU), (__addr) + 1); \ + else if ((__mask) == 0xff0000U) \ + writeb((u8)((data) & 0xffU), (__addr) + 2); \ + else if ((__mask) == 0xff000000U) \
drivers/gpu/drm/spacemit/spacemit_dpu_reg.h line 59
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_dpu_reg.h new file +10
-0+writeb ((u8)((data) &0xffU ), (__addr) +3 ); \ + else if ((__mask) == 0xffffU) \ + writew((u16)((data) & 0xffffU), __addr); \ + else if ((__mask) == 0xffff0000U) \ + writew((u16)((data) & 0xffffU), (__addr) + 2); \ + else if ((__mask) == 0xffffffffU) \ + writel((u32)(data), __addr); \ + else \ + writel((readl(__addr) & ~(__mask)) | \ + FIELD_PREP(__mask, (u32)(data)), __addr); \
[Severity: Medium]
Could concurrent updates corrupt the hardware state here?
This is an unprotected read-modify-write sequence. If a register contains multiple fields updated from different contexts (e.g., process context during atomic commits and interrupt context during ISR handling), it might lose updates without a spinlock.
Quoted 1 line
+} while (0)
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=8
Thomas Zimmermann
maintainerRe: [PATCH v2 08/17] drm/spacemit: add Saturn DPU core types, cmdlist and display MMU
In reply to Cody KangHi
Am 09.08.26 um 15:14 schrieb Cody Kang via B4 Relay:
Quoted 7 lines
From: Cody Kang <[email protected]>
Register programming of the Saturn DPU is batched: the driver builds per-module register lists in memory and the hardware command-list engine replays them at frame boundaries, while scanout buffers are mapped through the DPU's private address translation unit (DMMU) rather than scanned out by physical address.
I've looked through the code in patch 10. How does a plane interact with the hardware? It apparently has its own command list, but there's mostly code for the CRTC update.
Best regards
Thomas
Quoted 1,456 lines
Add the shared driver types, the MMIO field accessors, the trace events, the command-list builder and the DMMU table code. Some DPU configuration registers are write-only, so a read-modify-write would corrupt neighbouring fields; byte- and halfword-aligned fields are therefore written at their native width instead.
Signed-off-by Cody Kang <[email protected]>---
v2:
- hold the DPU reset lines as onereset_control_bulk_datapipe_resets[5] array inspacemit_drm_privateand drop the pointers duplicated into structspacemit_crtc(Philipp Zabel)
- drop theINT_VSYNC_UPDATEenum member; it never had an irq_list[] mapping and the register model has no such status bit (Sashiko)
- drop the unreachable multi-planar arms inspacemit_dmmu_map(); every advertised format is single-planar (Sashiko)
- drop the unused cmdlist parameter from thecrtc_cmdlistop (Sashiko)--- drivers/gpu/drm/spacemit/dpu/dpu_saturn.h | 35 +++ drivers/gpu/drm/spacemit/dpu/dpu_trace.h | 350 ++++++++++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_cmdlist.c | 304 ++++++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_cmdlist.h | 146 ++++++++++++ drivers/gpu/drm/spacemit/spacemit_crtc.h | 246 +++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_dmmu.c | 80 +++++++ drivers/gpu/drm/spacemit/spacemit_dmmu.h | 40 ++++ drivers/gpu/drm/spacemit/spacemit_dpu_reg.h | 108 +++++++++ drivers/gpu/drm/spacemit/spacemit_drm.h | 61 +++++ 9 files changed, 1370 insertions(+)drivers/gpu/drm/spacemit/dpu/dpu_saturn.h new file +35
-0@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _DPU_SATURN_H_ +#define _DPU_SATURN_H_ + +#include "../spacemit_crtc.h" + +struct dpu_format_id { +u32 format;/* DRM fourcc */ +u8 id; +u8 bpp;/* bits per pixel */ +}; + +#define SPACEMIT_DPU_INVALID_FORMAT_ID 0xff + +enum format_features { +FORMAT_RGB =BIT (0 ), +}; + +struct spacemit_hw_rdma { +u16 formats; +}; + +int dpu_parse_clocks (struct device *dev,struct dpu_clk_context *clk_ctx); +u8 spacemit_plane_hw_get_format_id (u32 format); +u32 saturn_conf_dpuctrl_rdma (struct spacemit_crtc *a_crtc); +extern const struct spacemit_hw_device k3_saturn_dpu; +void saturn_enable_irq_mask (struct spacemit_crtc *a_crtc,bool enable, +u32 offset,u32 mask); +void spacemit_cfg_rdy_timer_handler (struct timer_list *t); +#endif drivers/gpu/drm/spacemit/dpu/dpu_trace.h new file +350
-0@@ -0,0 +1,350 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM spacemit_dpu + +#if !defined(_DPU_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ ) +#define _DPU_TRACE_H_ + +#include <linux/stringify.h> +#include <linux/types.h> +#include <linux/tracepoint.h> + +#include "dpu_saturn.h" + +TRACE_EVENT (drm_display_mode_info, + TP_PROTO(struct drm_display_mode *mode), +TP_ARGS (mode), +TP_STRUCT__entry ( + __field(u16, hdisplay) + __field(u16, hbp) + __field(u16, hfp) + __field(u16, hsync) + __field(u16, vdisplay) + __field(u16, vbp) + __field(u16, vfp) +__field (u16, vsync) + ), +TP_fast_assign ( + __entry->hdisplay = mode->hdisplay; + __entry->hbp = mode->htotal - mode->hsync_end; + __entry->hfp = mode->hsync_start - mode->hdisplay; + __entry->hsync = mode->hsync_end - mode->hsync_start; + __entry->vdisplay = mode->vdisplay; + __entry->vbp = mode->vtotal - mode->vsync_end; + __entry->vfp = mode->vsync_start - mode->vdisplay; + __entry->vsync = mode->vsync_end - mode->vsync_start; + ), +TP_printk ("drm_display_mode: hdisplay=%d vdisplay=%d hsync=%d vsync=%d hbp=%d hfp=%d vbp=%d vfp=%d" , + __entry->hdisplay, __entry->vdisplay, __entry->hsync, __entry->vsync, + __entry->hbp, __entry->hfp, __entry->vbp, __entry->vfp + ) +); + +TRACE_EVENT (dpu_plane_info, + TP_PROTO(struct drm_plane_state *state, struct drm_framebuffer *fb, + u32 rdma_id, u32 alpha, u32 rotation), +TP_ARGS (state, fb, rdma_id, alpha, rotation), +TP_STRUCT__entry ( + __field(u32, rdma_id) + __field(u32, src_w) + __field(u32, src_h) + __field(u32, src_x) + __field(u32, src_y) + __field(u32, crtc_w) + __field(u32, crtc_h) + __field(u32, crtc_x) + __field(u32, crtc_y) + __field(u32, width) + __field(u32, height) + __field(u32, format) + __field(u32, blend_mode) + __field(u32, alpha) + __field(u32, zpos) +__field (u32, rotation) + ), +TP_fast_assign ( + __entry->rdma_id = rdma_id; + __entry->src_w = state->src_w >> 16; + __entry->src_h = state->src_h >> 16; + __entry->src_x = state->src_x >> 16; + __entry->src_y = state->src_y >> 16; + __entry->crtc_w = state->crtc_w; + __entry->crtc_h = state->crtc_h; + __entry->crtc_x = state->crtc_x; + __entry->crtc_y = state->crtc_y; + __entry->width = fb->width; + __entry->height = fb->height; + __entry->format = fb->format->format; + __entry->blend_mode = state->pixel_blend_mode; + __entry->alpha = alpha; + __entry->zpos = state->zpos; + __entry->rotation = rotation; + ), +TP_printk ("rdma_id=%d src: w=%d h=%d x=%d y=%d crtc: w=%d h=%d x=%d y=%d width=%d height=%d fmt=0x%x blend=%d alpha=%d zpos=%d rot=%d" , + __entry->rdma_id, __entry->src_w, + __entry->src_h, __entry->src_x, + __entry->src_y, __entry->crtc_w, + __entry->crtc_h, __entry->crtc_x, + __entry->crtc_y, __entry->width, + __entry->height, __entry->format, + __entry->blend_mode, __entry->alpha, + __entry->zpos, __entry->rotation) +); + +DECLARE_EVENT_CLASS (dpu_status_template, + TP_PROTO(const char *name, int status), +TP_ARGS (name, status), +TP_STRUCT__entry ( + __string(name_str, name) +__field (int, status) + ), +TP_fast_assign ( + __assign_str(name_str); + __entry->status = status; + ), +TP_printk ("%s: 0x%x" , +__get_str (name_str), __entry->status) +); + +DEFINE_EVENT (dpu_status_template, dpuctrl, + TP_PROTO(const char *name, int status), +TP_ARGS (name, status) +); +DEFINE_EVENT (dpu_status_template, spacemit_plane_update_hw_channel, + TP_PROTO(const char *name, int status), +TP_ARGS (name, status) +); +DEFINE_EVENT (dpu_status_template, saturn_irq_enable, + TP_PROTO(const char *name, int status), +TP_ARGS (name, status) +); +DEFINE_EVENT (dpu_status_template, saturn_enable_vsync, + TP_PROTO(const char *name, int status), +TP_ARGS (name, status) +); +DEFINE_EVENT (dpu_status_template, dpu_isr_status, + TP_PROTO(const char *name, int status), +TP_ARGS (name, status) +); + +DECLARE_EVENT_CLASS (dpu_uint64_t_data_template, + TP_PROTO(const char *name, u64 data), +TP_ARGS (name, data), +TP_STRUCT__entry ( + __string(name_str, name) +__field (u64, data) + ), +TP_fast_assign ( + __assign_str(name_str); + __entry->data = data; + ), +TP_printk ("%s: %lld" , +__get_str (name_str), __entry->data) +); + +DEFINE_EVENT (dpu_uint64_t_data_template, u64_data, + TP_PROTO(const char *name, u64 data), +TP_ARGS (name, data) +); + +TRACE_EVENT (spacemit_dpu_reg_write, + TP_PROTO(u32 data, u32 base, const char *name), +TP_ARGS (data, base, name), +TP_STRUCT__entry ( + __field(u32, data) + __field(u32, base) +__string (name_str, name) + ), +TP_fast_assign ( + __entry->data = data; + __entry->base = base; + __assign_str(name_str); + ), +TP_printk ("dpu write 0x%x to addr 0x%x field %s" , + __entry->data, __entry->base,__get_str (name_str)) +); + +TRACE_EVENT (spacemit_plane_disable_hw_channel, + TP_PROTO(u32 layer_id, u32 rdma_id), +TP_ARGS (layer_id, rdma_id), +TP_STRUCT__entry ( + __field(u32, layer_id) +__field (u32, rdma_id) + ), +TP_fast_assign ( + __entry->layer_id = layer_id; + __entry->rdma_id = rdma_id; + ), +TP_printk ("layer_id:%d rdma_id:%d" , + __entry->layer_id, __entry->rdma_id) +); + +DECLARE_EVENT_CLASS (dpu_func_template, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id), +TP_STRUCT__entry ( +__field (u32, dev_id) + ), +TP_fast_assign ( + __entry->dev_id = dev_id; + ), +TP_printk ("dev_id=%d" , __entry->dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_plane_atomic_check, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_plane_atomic_update, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_plane_atomic_duplicate_state, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_plane_atomic_destroy_state, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_plane_init, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, dpu_enable_clocks, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, dpu_disable_clocks, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, dpu_uninit, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, dpu_isr, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, dpu_run, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_atomic_enable, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_atomic_disable, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_atomic_check, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_atomic_begin, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_atomic_flush, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_enable_vblank, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_disable_vblank, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_run, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_init, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, spacemit_crtc_uninit, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DEFINE_EVENT (dpu_func_template, saturn_ctrl_cfg_ready_timer, + TP_PROTO(u32 dev_id), +TP_ARGS (dev_id) +); +DECLARE_EVENT_CLASS (dpu_ctrl_template, + TP_PROTO(int id, int enable), +TP_ARGS (id, enable), +TP_STRUCT__entry ( + __field(u32, id) +__field (u32, enable) + ), +TP_fast_assign ( + __entry->id = id; + __entry->enable = enable; + ), +TP_printk ("id=%d enable:%d" , + __entry->id, __entry->enable) +); +DEFINE_EVENT (dpu_ctrl_template, saturn_ctrl_cfg_ready, + TP_PROTO(int id, int enable), +TP_ARGS (id, enable) +); + +DEFINE_EVENT (dpu_ctrl_template, saturn_ctrl_sw_start, + TP_PROTO(int id, int enable), +TP_ARGS (id, enable) +); + +TRACE_EVENT (plat_cmdlist_dump_node, +TP_PROTO (char *dump), +TP_ARGS (dump), +TP_STRUCT__entry ( +__string (dump_str, dump) + ), +TP_fast_assign ( + __assign_str(dump_str); + ), +TP_printk ("%s" ,__get_str (dump_str)) +); + +TRACE_EVENT (cmdlist_dump_node, + TP_PROTO(char *type, int rdma_id, u8 dev_id, int zpos, u16 nod_len), +TP_ARGS (type, rdma_id, dev_id, zpos, nod_len), +TP_STRUCT__entry ( + __string(type_str, type) + __field(int, rdma_id) + __field(u8, dev_id) + __field(int, zpos) +__field (u16, nod_len) + ), +TP_fast_assign ( + __assign_str(type_str); + __entry->rdma_id = rdma_id; + __entry->dev_id = dev_id; + __entry->zpos = zpos; + __entry->nod_len = nod_len; + ), +TP_printk ("cmdlist[%s]: rdma_id:%d crtc:%d zpos:%d rows:%d" , +__get_str (type_str), + __entry->rdma_id, + __entry->dev_id, + __entry->zpos, + __entry->nod_len) +); +#endif /* _DPU_TRACE_H_ */ + +/* This part must be outside protection */ +#undef TRACE_INCLUDE_FILE +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/spacemit/dpu/ + +#define TRACE_INCLUDE_FILE dpu_trace +#include <trace/define_trace.h> drivers/gpu/drm/spacemit/spacemit_cmdlist.c new file +304
-0@@ -0,0 +1,304 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#include <linux/dma-mapping.h> +#include <linux/sort.h> +#include <drm/drm_print.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_plane_helper.h> +#include "spacemit_cmdlist.h" +#include "spacemit_crtc.h" +#include "spacemit_dpu_reg.h" +#include "spacemit_drm.h" +#include "dpu/dpu_saturn.h" +#include "dpu/dpu_trace.h" + +struct spacemit_plane_state *cl_to_spacemit_pstate (const struct cmdlist *cl) +{ + return container_of(cl, struct spacemit_plane_state, cl); +} + +struct spacemit_crtc_state *cl_to_spacemit_cstate (const struct cmdlist *cl) +{ + return container_of(cl, struct spacemit_crtc_state, cl); +} + +struct cmdlist *plane_to_cl (struct drm_plane *plane) +{ +struct spacemit_plane_state *spacemit_pstate = +to_spacemit_plane_state (plane->state); + +return &spacemit_pstate->cl; +} + +struct cmdlist *crtc_to_cl (struct drm_crtc *crtc) +{ +struct spacemit_crtc_state *spacemit_cstate = +to_spacemit_crtc_state (crtc->state); + +return &spacemit_cstate->cl; +} + +static void cmdlist_dump_node (struct cmdlist *cl) +{ +struct spacemit_drm_private *priv; +struct spacemit_hw_device *hwdev; +struct spacemit_crtc *a_crtc; +char *type; +int zpos =-1 , rdma_id =-1 ; + +if (!cl) +return ; + +if (cl->type ==CMDLIST_PLANE ) { +struct spacemit_plane_state *spacemit_pstate = +cl_to_spacemit_pstate (cl); + + a_crtc =to_spacemit_crtc (spacemit_pstate->state.crtc); + rdma_id = spacemit_pstate->rdma_id; + zpos = (int )(spacemit_pstate->state.zpos); + type ="RDMA" ; + }else if (cl->type ==CMDLIST_CRTC ) { +struct spacemit_crtc_state *spacemit_cstate = +cl_to_spacemit_cstate (cl); + + a_crtc =to_spacemit_crtc (spacemit_cstate->base.crtc); + type ="CRTC" ; + }else { +return ; + } + +trace_cmdlist_dump_node (type, rdma_id, a_crtc->dev_id, zpos, + cl->nod_len); + + priv = a_crtc->crtc.dev->dev_private; + hwdev = priv->hwdev; + hwdev->cmdlist_dump_node (cl); +} + +void cmdlist_regs_packing (struct cmdlist *cl,enum cmdlist_mode_type mod, +struct cmdlist_regs *cl_regs) +{ +struct spacemit_crtc *a_crtc; +struct spacemit_drm_private *priv; +struct spacemit_hw_device *hwdev; +u32 *reg_base; +int i; +u32 index; + +if (!cl_regs) +return ; + +if (cl->type ==CMDLIST_PLANE ) { +struct spacemit_plane_state *spacemit_pstate = +cl_to_spacemit_pstate (cl); + + a_crtc =to_spacemit_crtc (spacemit_pstate->state.crtc); + +drm_dbg (a_crtc->crtc.dev,"rch_id = %d, ch_y = %u\n" , + spacemit_pstate->rdma_id, + spacemit_pstate->state.crtc_y); + }else if (cl->type ==CMDLIST_CRTC ) { +struct spacemit_crtc_state *spacemit_cstate = +cl_to_spacemit_cstate (cl); + + a_crtc =to_spacemit_crtc (spacemit_cstate->base.crtc); + }else { +WARN_ONCE (1 ,"unsupported cmdlist type %d\n" , cl->type); +return ; + } + + priv = a_crtc->crtc.dev->dev_private; + hwdev = priv->hwdev; + reg_base = cl_regs->module; + + cl->mode_mask |= mod; + +/* +* Without the atomic_check() buffer the staged register writes vanish. +*/ +if (drm_WARN_ON (a_crtc->crtc.dev, !cl->va)) +return ; + +for (i =0 ; i < cl_regs->size;) { +u32 value[CMDLIST_ROW_REGS ] = {0x0 }; +u32 offset, strobe =0 ; +u8 regs_in_row =0 ; + +if (cl_regs->flags[i]) { + offset = cl_regs->base + i *sizeof (u32); +for (u8 j =0 ; j <CMDLIST_ROW_REGS ; j++) { + index = i + j; +if (likely (index < cl_regs->size)) { +if (cl_regs->flags[index]) { + value[j] = reg_base[index]; + regs_in_row++; + strobe |=CMDLIST_REG_STROBE (j); + } + }else { +break ; + } + } + hwdev->cmdlist_fill_data_row (cl, strobe, offset, value); +/* +* the row covers the whole window; a shorter stride +* would revisit covered words as duplicate rows +*/ + i +=CMDLIST_ROW_REGS ; + cl->nod_len++; + }else { + i++; + } + } + +drm_dbg (a_crtc->crtc.dev,"row_num = %d\n" , cl->nod_len); +} + +void cmdlist_sort_by_group (struct drm_crtc *crtc) +{ +struct cmdlist *first_cl; +struct cmdlist *last_cl; +struct cmdlist *p; +struct cmdlist *prev; +struct drm_plane *plane; +struct spacemit_crtc_rdma *rdmas = +to_spacemit_crtc_state (crtc->state)->rdmas; +struct spacemit_drm_private *priv = crtc->dev->dev_private; + +drm_atomic_crtc_for_each_plane (plane, crtc) { +struct spacemit_plane_state *spacemit_pstate = +to_spacemit_plane_state (plane->state); +u32 rdma_id = spacemit_pstate->rdma_id; + + first_cl = &spacemit_pstate->cl; +if (!first_cl->va) +continue ; + + last_cl = first_cl; + last_cl->next =NULL ; + + rdmas[rdma_id].in_use = true; +if (priv->cmdlist_groups[rdma_id]) { + p = priv->cmdlist_groups[rdma_id]; + prev =NULL ; +while (p) { +if (cl_to_spacemit_pstate (p)->state.crtc_y < + spacemit_pstate->state.crtc_y) { + prev = p; + p = p->next; + }else { +break ; + } + } +if (!prev) { + priv->cmdlist_groups[rdma_id] = first_cl; + last_cl->next = p; + }else { + prev->next = first_cl; + last_cl->next = p; + } + }else { + priv->cmdlist_groups[rdma_id] = first_cl; + } + } +} + +void cmdlist_atomic_commit (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +int i; +struct cmdlist *cur_cl, *first_cl; +struct spacemit_crtc *a_crtc =NULL ; +u32 chy, addrl, addrh; +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct spacemit_crtc_rdma *cur_rdmas = +to_spacemit_crtc_state (crtc->state)->rdmas; +struct spacemit_crtc_rdma *old_rdmas = +to_spacemit_crtc_state (old_state)->rdmas; + + a_crtc =to_spacemit_crtc (crtc); + +for (i =0 ; i < hwdev->rdma_nums; i++) { +if (old_rdmas[i].in_use) + hwdev->enable_cmdlist (a_crtc, hwdev, i, false); + +if (cur_rdmas[i].in_use) { +drm_dbg (crtc->dev,"cmdlist group = %d\n" , i); + cur_cl = priv->cmdlist_groups[i]; + first_cl = cur_cl; +while (cur_cl) { + hwdev->cmdlist_fill_conf_row (cur_cl, hwdev, +CMDLIST_CMP_INVALID ); +cmdlist_dump_node (cur_cl); + cur_cl = cur_cl->next; + } + chy =cl_to_spacemit_pstate (first_cl)->state.crtc_y; + addrl = (lower_32_bits (priv->cmdlist_groups[i]->pa) & +CMDLIST_ADDRL_ALIGN_MASK ) >>CMDLIST_ADDRL_ALIGN_BITS ; + + addrh =upper_32_bits (priv->cmdlist_groups[i]->pa); + hwdev->cfg_cmdlist (hwdev, i, chy, addrl, addrh); + hwdev->enable_cmdlist (a_crtc, hwdev, i, true); + priv->cmdlist_groups[i] =NULL ; + } + } +} + +void crtc_cmdlist_sort_by_group (struct spacemit_crtc *a_crtc) +{ +struct cmdlist *first_cl; +struct cmdlist *last_cl; +struct drm_crtc *crtc = &a_crtc->crtc; +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct drm_crtc_state *crtc_state = a_crtc->crtc.state; +struct spacemit_crtc_state *spacemit_crtc_state = +to_spacemit_crtc_state (crtc_state); +u8 crtc_id =drm_crtc_index (crtc); + + first_cl = &spacemit_crtc_state->cl; + last_cl = first_cl; + last_cl->next =NULL ; + priv->cmdlist_groups[hwdev->rdma_nums + crtc_id] = first_cl; +} + +void crtc_cmdlist_atomic_commit (struct spacemit_crtc *a_crtc) +{ +struct cmdlist *cur_cl; +struct drm_crtc *crtc = &a_crtc->crtc; +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +u8 crtc_id =drm_crtc_index (crtc); +u8 dev_id = a_crtc->dev_id; + +drm_dbg (crtc->dev,"cmdlist group = %d\n" , + hwdev->rdma_nums + crtc_id); + cur_cl = priv->cmdlist_groups[hwdev->rdma_nums + crtc_id]; +while (cur_cl) { + hwdev->cmdlist_fill_conf_row (cur_cl, hwdev, dev_id); +cmdlist_dump_node (cur_cl); + cur_cl = cur_cl->next; + } + hwdev->crtc_cmdlist (hwdev, priv, crtc_id, dev_id); +} + +/* Called from atomic_check(), where -ENOMEM is still an answer. */ +int spacemit_cmdlist_alloc (struct device *dev,struct cmdlist *cl) +{ +if (cl->va) +return 0 ; + + cl->size =PER_CMDLIST_SIZE ; + cl->va =dma_alloc_coherent (dev, cl->size, &cl->pa, +GFP_KERNEL | __GFP_ZERO); +if (!cl->va) +return -ENOMEM ; + +return 0 ; +}drivers/gpu/drm/spacemit/spacemit_cmdlist.h new file +146
-0@@ -0,0 +1,146 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _SATURN_FW_CMDLIST_H_ +#define _SATURN_FW_CMDLIST_H_ + +#include <linux/stddef.h> +#include <linux/types.h> +#include <drm/drm_crtc.h> +#include <drm/drm_plane.h> + +struct spacemit_crtc ; +struct spacemit_plane_state ; + +#define PER_CMDLIST_SIZE 4096 +#define CMDLIST_ROW_REGS (3) +#define CMDLIST_CMP_INVALID (0xff) +/* poison for the per-cmdlist compose sentinels, never written to hw */ +#define CMDLIST_SENTINEL_POISON 0xDEADBEEF + +/** +* enum cmdlist_type - what surface owns a cmdlist instance +* @CMDLIST_PLANE: Per-plane RDMA register batches. +* @CMDLIST_CRTC: Compose-side batches submitted on every flush. +*/ +enum cmdlist_type { +CMDLIST_PLANE =1 , +CMDLIST_CRTC , +}; + +/** +* struct cmdlist - A DMA-backed batch of register writes replayed at CFG_RDY +* @nod_len: Number of register-write rows currently filled. +* @size: Capacity of the DMA buffer in bytes. +* @mode_mask: cmdlist_mode_type sources; gates which rows are pulled. +* @va: Kernel virtual address of the DMA buffer. +* @pa: DMA address programmed into the cmdlist base register. +* @next: Cmdlists in submission order; the CRTC-level one comes last. +* @type: Originating surface; see &enum cmdlist_type. +* @rch_start_cmps_y: Compositor-Y start sentinel. +* @cmdlist_ch_y_other: Companion sentinel to @rch_start_cmps_y. +*/ +struct cmdlist { +u16 nod_len; +u32 size; +u32 mode_mask; +void *va; +dma_addr_t pa; +struct cmdlist *next; +u8 type; +u32 rch_start_cmps_y; +u32 cmdlist_ch_y_other; +}; + +enum cmdlist_mode_type { +CMDLIST_MOD_RDMA =BIT (0 ), +CMDLIST_MOD_COMP =BIT (3 ), +CMDLIST_MOD_DMMU =BIT (6 ), +}; + +#define CMDLIST_REG_STROBE (index) (0xf << ((index) * 4)) + +#define CMDLIST_ADDRL_ALIGN_BITS (4)/* From cmdlist_reg_0[] in CMDLIST_REG */ +#define CMDLIST_ADDRL_ALIGN_MASK \ + ((u32)(~(BIT(CMDLIST_ADDRL_ALIGN_BITS) - 1))) +/* NULL on failure is safe: every consumer falls back to direct MMIO. */ +#define alloc_cmdlist_regs (module_name) \ +({ \ + struct cmdlist_regs *cl = kzalloc(sizeof(*cl), GFP_KERNEL); \ + if (cl) { \ + cl->size = module_name##__NWORDS; \ + cl->module = kzalloc(4 * module_name##__NWORDS, GFP_KERNEL); \ + cl->flags = kzalloc(module_name##__NWORDS, GFP_KERNEL); \ + if (!cl->module || !cl->flags) { \ + kfree(cl->module); \ + kfree(cl->flags); \ + kfree(cl); \ + cl = NULL; \ + } \ + } \ + cl; \ +}) + +#define free_cmdlist_regs (cl_p) \ +do { \ + struct cmdlist_regs *cl = (cl_p); \ + if (cl) { \ + kfree(cl->module); \ + kfree(cl->flags); \ + kfree(cl); \ + } \ +} while (0) + +/* +* First touch seeds the word from a live MMIO read: only register blocks that +* read back what was written may be routed through cmdlist. +*/ +#define cmdlist_write_reg (hwdev, module_name, module_base, field, data, cl_regs) \ +do { \ + struct cmdlist_regs *cl_p = (cl_regs); \ + u32 *__words = cl_p->module; \ + const unsigned int __w = dpu_field_word(module_name, field); \ + if (cl_p->flags[__w] == 0) { \ + __words[__w] = readl((hwdev)->base + (module_base) + 4 * __w); \ + cl_p->base = (module_base); \ + cl_p->flags[__w] = 1; \ + } \ + __words[__w] &= ~dpu_field_mask(module_name, field); \ + __words[__w] |= FIELD_PREP(dpu_field_mask(module_name, field), \ + (u32)(data)); \ +} while (0) + +/* Raw whole-word variant (the value32[] call sites); no seeding needed. */ +#define cmdlist_write_word (module_base, word, data, cl_regs) \ +do { \ + struct cmdlist_regs *cl_p = (cl_regs); \ + u32 *__words = cl_p->module; \ + cl_p->base = (module_base); \ + cl_p->flags[(word)] = 1; \ + __words[(word)] = (u32)(data); \ +} while (0) + +struct cmdlist_regs { +u32 base; +u16 size; +u32 *module; +u8 *flags; +}; + +void cmdlist_regs_packing (struct cmdlist *cl,enum cmdlist_mode_type mod, +struct cmdlist_regs *cl_regs); +void cmdlist_sort_by_group (struct drm_crtc *crtc); +void cmdlist_atomic_commit (struct drm_crtc *crtc, +struct drm_crtc_state *old_state); +struct spacemit_plane_state *cl_to_spacemit_pstate (const struct cmdlist *cl); +void crtc_cmdlist_sort_by_group (struct spacemit_crtc *a_crtc); +void crtc_cmdlist_atomic_commit (struct spacemit_crtc *a_crtc); +struct spacemit_crtc_state *cl_to_spacemit_cstate (const struct cmdlist *cl); +int spacemit_cmdlist_alloc (struct device *dev,struct cmdlist *cl); +struct cmdlist *plane_to_cl (struct drm_plane *plane); +struct cmdlist *crtc_to_cl (struct drm_crtc *crtc); + +#endif /* _SATURN_FW_CMDLIST_H_ */ drivers/gpu/drm/spacemit/spacemit_crtc.h new file +246
-0@@ -0,0 +1,246 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _SPACEMIT_CRTC_H_ +#define _SPACEMIT_CRTC_H_ + +#include <linux/delay.h> +#include <linux/string.h> +#include <linux/platform_device.h> +#include <linux/device.h> +#include <linux/kernel.h> +#include <linux/bug.h> +#include <linux/regmap.h> +#include <video/videomode.h> +#include <linux/workqueue.h> + +#include <drm/drm_atomic_uapi.h> +#include <drm/drm_print.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_vblank.h> +#include "spacemit_dpu_ids.h" +#include "spacemit_cmdlist.h" +#include "spacemit_drm.h" +#include <linux/spinlock.h> + +#define RDMA_INVALID_ID (~0) + +#define DPU_MCLK_DEFAULT 307200000 +#define DPU_AXICLK_DEFAULT 409000000 + +enum spacemit_dpu_irq { +INT_UNDERRUN , +INT_CFG_RDY , +INT_VSYNC , +INT_EOF , +INT_REST , +}; + +struct spacemit_crtc_fbcmem { +u32 start; +u32 size; +bool map; +}; + +struct spacemit_crtc_rdma { +struct spacemit_crtc_fbcmem fbcmem; +bool in_use; +u32 use_cnt; +}; + +struct dpu_mmu_tbl { +u32 size; +void *va; +dma_addr_t pa; +}; + + +/** +* struct spacemit_crtc - Per-instance state for a Saturn DPU CRTC +* @dev: Underlying platform device for this DPU instance. +* @crtc: Embedded DRM CRTC; reachable via to_spacemit_crtc(). +* @core: Vtable of DPU pipeline operations, populated at probe. +* @mmu_tbl: DPU-local page table mapping planes' buffers into the TBUs. +* @dev_id: Vendor-numbered DPU instance ID (0 or 1 on K3). +* @irq_online: Online-compose IRQ, kept for synchronize_irq(). +* @cfg_rdy_timer: Watchdog for a CFG_RDY that never arrives. +* @is_1st_f: True until the first frame of a new modeset is transferred. +* @first_modeset: True until the first .atomic_enable after probe; that first +* pass resets the DPU to stop the U-Boot pipeline. +* @clk_ctx: Cached clock handles, enabled by dpu_enable_clocks(). +* @aclk: Requested DPU AXI clock rate (Hz). +* @out_format: Output pixel format register cache. +* @cl_rdma: Cmdlist register slot for RDMA programming. +* @flip_done: Set once the DPU has committed the most recent page flip. +* @clocks_on: True while clocks run; MMIO on a gated DPU stalls the bus. +* @ur_reported: True once an underrun has been logged since the last CFG_RDY. +* @ur_mask_armed: True while clr_int_sts() may still mask the underrun IRQ. +*/ +struct spacemit_crtc { +struct device *dev; +struct drm_crtc crtc; +const struct dpu_core_ops *core; +struct dpu_mmu_tbl mmu_tbl; +int dev_id; +int irq_online; +struct timer_list cfg_rdy_timer; + +bool is_1st_f; +bool first_modeset; +struct dpu_clk_context clk_ctx; +u32 aclk; +u32 out_format; + +struct cmdlist_regs *cl_rdma; + +bool flip_done; + +bool clocks_on; + +bool ur_reported; +bool ur_mask_armed; +}; + +static inline struct spacemit_crtc *to_spacemit_crtc (struct drm_crtc *crtc) +{ + return crtc ? container_of(crtc, struct spacemit_crtc, crtc) : NULL; +} + +struct spacemit_hw_device ; +struct dpu_core_ops { +int (*init)(struct spacemit_crtc *a_crtc); +void (*uninit)(struct spacemit_crtc *a_crtc); +void (*run)(struct drm_crtc *crtc, +struct drm_crtc_state *old_state); +void (*disable_vsync)(struct spacemit_crtc *a_crtc); +void (*enable_vsync)(struct spacemit_crtc *a_crtc); +u32 (*online_isr)(struct spacemit_crtc *a_crtc); +int (*enable_clk)(struct spacemit_crtc *a_crtc); +int (*disable_clk)(struct spacemit_crtc *a_crtc); +int (*cal_layer_fbcmem_size)(struct drm_plane *plane, +struct drm_plane_state *state); +int (*adjust_rdma_fbcmem)(struct spacemit_hw_device *hwdev, +struct spacemit_crtc_rdma *rdmas); +}; + +extern const struct dpu_core_ops dpu_saturn_ops; + +int spacemit_crtc_run (struct drm_crtc *crtc, +struct drm_crtc_state *old_state); + +struct spacemit_plane { +struct drm_plane plane; +struct spacemit_hw_device *hwdev; +}; + +/** +* struct spacemit_plane_state - Subclassed drm_plane_state for the Saturn DPU +* @state: Embedded drm_plane_state; reachable via to_spacemit_plane_state(). +* @rdma_id: RDMA channel feeding this plane, derived from its zpos. +* @format: DPU-internal pixel-format token translated from the fourcc. +* @fbcmem_size: Bytes of FBC line buffer reserved for this plane. +* @mmu_tbl: Per-plane page table populated by spacemit_dmmu_map(). +* @cl: Plane-level cmdlist filled during atomic_update. +*/ +struct spacemit_plane_state { +struct drm_plane_state state; +u32 rdma_id; +u8 format; +u32 fbcmem_size; +struct dpu_mmu_tbl mmu_tbl; +struct cmdlist cl; +}; + +struct spacemit_plane *to_spacemit_plane (struct drm_plane *plane); + +static inline struct +spacemit_plane_state * +to_spacemit_plane_state (const struct drm_plane_state *state) +{ + return container_of(state, struct spacemit_plane_state, state); +} + +/** +* struct spacemit_crtc_state - Subclassed drm_crtc_state for the Saturn DPU +* @base: Embedded drm_crtc_state; reachable via to_spacemit_crtc_state(). +* @rdmas: Per-RDMA-channel descriptors, hwdev->rdma_nums entries. +* @cl: CRTC-level cmdlist used during atomic_flush. +*/ +struct spacemit_crtc_state { +struct drm_crtc_state base; +struct spacemit_crtc_rdma *rdmas; +struct cmdlist cl; +}; + +#define to_spacemit_crtc_state (x) \ + container_of(x, struct spacemit_crtc_state, base) + +struct drm_plane *spacemit_plane_init (struct drm_device *drm, +struct spacemit_crtc *a_crtc); + +struct spacemit_plane_state ; +struct spacemit_crtc ; +struct tbu_instance ; +struct dpu_mmu_tbl ; +enum spacemit_dpu_irq ; + +/* +* Per-revision Saturn DPU description and operation vtable. One static instance +* per DT compatible, selected at probe; reached through spacemit_crtc::core. +*/ +struct spacemit_hw_device { +void __iomem *base; +struct regmap *regmap; +u8 plane_nums; +u8 rdma_nums; +u8 crtc_nums; +const struct spacemit_hw_rdma *rdmas; +u8 n_formats; +const struct dpu_format_id *formats; +u8 n_fbcmems; +const u32 *fbcmem_sizes; +void (*enable_vsync)(struct spacemit_crtc *a_crtc, +struct spacemit_hw_device *hwdev,bool enable); +void (*enable_cfg_irq)(struct spacemit_crtc *a_crtc, +struct spacemit_hw_device *hwdev,bool enable); +void (*cfg_ready)(struct spacemit_crtc *a_crtc, +struct spacemit_hw_device *hwdev); +void (*sw_start)(struct spacemit_crtc *a_crtc, +struct spacemit_hw_device *hwdev); +void (*dpu_init)(struct spacemit_crtc *a_crtc); +void (*irq_enable)(struct spacemit_crtc *a_crtc,bool enable); +void (*plane_update_hw_channel)(struct drm_plane *plane); +void (*plane_disable_hw_channel)(struct drm_plane *plane, +struct drm_plane_state *old_state); +void (*conf_dpuctrl)(struct drm_crtc *crtc, +struct drm_crtc_state *old_state); +u32 (*get_cfg_rdy)(struct spacemit_crtc *a_crtc, +struct spacemit_hw_device *hwdev); +u32 (*get_irq_bit)(enum spacemit_dpu_irq irq_id,int dev_id); +u32 (*get_int_sts)(struct spacemit_hw_device *hwdev,int dev_id); +void (*clr_int_sts)(struct spacemit_crtc *a_crtc,u32 data,int dev_id); +void (*enable_cmdlist)(struct spacemit_crtc *a_crtc, +struct spacemit_hw_device *hwdev,int id, +bool enable); +void (*cfg_cmdlist)(struct spacemit_hw_device *hwdev,int id,u32 chy, +u32 addrl,u32 addrh); +void (*rdma_dmmu)(struct spacemit_hw_device *hwdev,u8 tbu_id, +struct tbu_instance *tbu,struct drm_framebuffer *fb, +u32 val,struct cmdlist_regs *cl_rdma, +struct drm_plane *plane); +int (*get_cl_rdma_buf)(struct spacemit_crtc *a_crtc); +void (*cmdlist_fill_data_row)(struct cmdlist *cl,u32 strobe, +u32 offset,u32 value[]); +void (*cmdlist_fill_conf_row)(struct cmdlist *cl, +struct spacemit_hw_device *hwdev, +u8 dev_id); +void (*crtc_cmdlist)(struct spacemit_hw_device *hwdev, +struct spacemit_drm_private *priv,u8 crtc_id, +u8 dev_id); +void (*cmdlist_dump_node)(struct cmdlist *cl); +}; +#endif drivers/gpu/drm/spacemit/spacemit_dmmu.c new file +80
-0@@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2023-2026 SpacemiT Co., Ltd. +* +*/ + +#include <linux/stddef.h> +#include <linux/gfp.h> +#include <linux/dma-mapping.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_gem_shmem_helper.h> + +#include "spacemit_cmdlist.h" +#include "spacemit_dmmu.h" +#include "spacemit_drm.h" +#include "spacemit_crtc.h" +#include "spacemit_dpu_reg.h" + +static inline void spacemit_dmmu_fill_pgtable (struct dpu_mmu_tbl *tbl, +struct sg_table *sgt) +{ +struct sg_dma_page_iter dma_iter; +u32 max_entries = tbl->size /4 ; +u32 *ttbr = tbl->va; +u32 i =0 , n =0 , temp =0 ; + +for_each_sgtable_dma_page (sgt, &dma_iter,0 ) { +/* +* atomic_check sized the table off this same fb; catch a drift +*/ +if (WARN_ON_ONCE (n +HW_ALIGN_TTB_NUM >= max_entries)) +break ; + ttbr[n++] = (sg_page_iter_dma_address (&dma_iter) >>PAGE_SHIFT ) &0x3FFFFFF ; + } + +if (WARN_ON_ONCE (!n)) +return ; + +/* +* The silicon over-fetches past the last entry; pad it to avoid a DDR +* fault. +*/ + temp = ttbr[n -1 ]; +for (i =0 ; i <HW_ALIGN_TTB_NUM ; i++) + ttbr[n++] = temp; +} + +int spacemit_dmmu_map (struct drm_framebuffer *fb,struct dpu_mmu_tbl *mmu_tbl, +u8 tbu_id,struct cmdlist_regs *cl_rdma, +struct drm_plane *plane) +{ +struct spacemit_drm_private *priv = fb->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct sg_table *sgt =NULL ; +struct tbu_instance tbu = { }; +u32 val; + + sgt =drm_gem_shmem_get_pages_sgt (to_drm_gem_shmem_obj (fb->obj[0 ])); +if (IS_ERR (sgt)) +return PTR_ERR (sgt); + +/* Every advertised format is single-planar */ + tbu.ttb_pa[0 ] = mmu_tbl->pa; + tbu.tbu_va[0 ] =TBU_BASE_VA (tbu_id); + tbu.ttb_size[0 ] =roundup (fb->obj[0 ]->size,PAGE_SIZE ) >>PAGE_SHIFT ; + +spacemit_dmmu_fill_pgtable (mmu_tbl, sgt); + +/* +* enable = 1, fbc_mode = 0 (linear only) +* single plane in bits [3:2] +*/ + val =0x1 ; +/* tbu_burst_limit_en = 1, tlb_fetch_active_en = 1 */ + val |=BIT (4 ) |BIT (5 ); + val = val | (DPU_QOS_URGENT <<8 ); + hwdev->rdma_dmmu (hwdev, tbu_id, &tbu, fb, val, cl_rdma, plane); + +return 0 ; +}drivers/gpu/drm/spacemit/spacemit_dmmu.h new file +40
-0@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _SPACEMIT_DMMU_H_ +#define _SPACEMIT_DMMU_H_ + +#include <linux/types.h> + +#include <drm/drm_file.h> +#include "spacemit_cmdlist.h" + +#define DPU_QOS_URGENT 4 +#define DPU_QOS_NORMAL 3 +#define DPU_QOS_LOW 2 +/* Worst-case TLB alignment over-fetch at the maximum 4096 src_x. */ +#define HW_ALIGN_TTB_NUM 60 + +#define RD_OUTS_NUM 16 +#define RDMA_TIMELIMIT 0xFFFF + +#define BASE_VA 0x10000000ULL +#define VA_STEP_PER_TBU 0x40000000ULL + +#define TBU_BASE_VA (tbu_id) ((u64)BASE_VA + (u64)VA_STEP_PER_TBU * (tbu_id)) + +struct tbu_instance { +u64 ttb_pa[3 ]; +u64 tbu_va[3 ]; +u32 ttb_size[3 ]; +}; + +struct dpu_mmu_tbl ; +int spacemit_dmmu_map (struct drm_framebuffer *fb,struct dpu_mmu_tbl *mmu_tbl, +u8 tbu_id,struct cmdlist_regs *cl_rdma, +struct drm_plane *plane); + +#endif /* _SPACEMIT_DMMU_H_ */ drivers/gpu/drm/spacemit/spacemit_dpu_reg.h new file +108
-0@@ -0,0 +1,108 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +* Saturn DPU register accessors. +*/ + +#ifndef _SPACEMIT_DPU_REG_H_ +#define _SPACEMIT_DPU_REG_H_ + +#include <linux/bitfield.h> +#include <linux/io.h> + +#include "dpu/dpu_trace.h" +#include "dpu/saturn_regs/saturn_fields.h" + +#define dpu_field_word (module_name, field) (module_name##__##field##_WORD) +#define dpu_field_mask (module_name, field) (module_name##__##field##_MASK) + +/* MMIO field read: returns the field value shifted down to bit 0. */ +#define dpu_read_reg (hwdev, module_name, module_base, field) \ + FIELD_GET(dpu_field_mask(module_name, field), \ + readl((hwdev)->base + (module_base) + \ + 4 * dpu_field_word(module_name, field))) + +/* MMIO raw 32-bit register read/write by word index within the block. */ +#define dpu_read_word (hwdev, module_base, word) \ + readl((hwdev)->base + (module_base) + 4 * (word)) + +#define dpu_write_reg_word (hwdev, module_base, word, data) \ +do { \ + trace_spacemit_dpu_reg_write((u32)(data), (module_base), NULL); \ + writel((u32)(data), \ + (hwdev)->base + (module_base) + 4 * (word)); \ +} while (0) + +/* +* Not every DPU config word reads back what was written, so a byte- or +* halfword-aligned field is stored at its own width rather than read-modified. +*/ +#define __dpu_mmio_field_write (__addr, __mask, data) \ +do { \ + if ((__mask) == 0xffU) \ + writeb((u8)((data) & 0xffU), __addr); \ + else if ((__mask) == 0xff00U) \ + writeb((u8)((data) & 0xffU), (__addr) + 1); \ + else if ((__mask) == 0xff0000U) \ + writeb((u8)((data) & 0xffU), (__addr) + 2); \ + else if ((__mask) == 0xff000000U) \ + writeb((u8)((data) & 0xffU), (__addr) + 3); \ + else if ((__mask) == 0xffffU) \ + writew((u16)((data) & 0xffffU), __addr); \ + else if ((__mask) == 0xffff0000U) \ + writew((u16)((data) & 0xffffU), (__addr) + 2); \ + else if ((__mask) == 0xffffffffU) \ + writel((u32)(data), __addr); \ + else \ + writel((readl(__addr) & ~(__mask)) | \ + FIELD_PREP(__mask, (u32)(data)), __addr); \ +} while (0) + +#define dpu_write_reg (hwdev, module_name, module_base, field, data) \ +do { \ + void __iomem *__waddr = (hwdev)->base + (module_base) + \ + 4 * dpu_field_word(module_name, field); \ + \ + trace_spacemit_dpu_reg_write((u32)(data), (module_base), #field); \ + __dpu_mmio_field_write(__waddr, \ + dpu_field_mask(module_name, field), data); \ +} while (0) + +/* Field write into a register array element; the index is a runtime value. */ +#define dpu_write_reg_arr (hwdev, module_name, module_base, arr, i, field, data) \ +do { \ + void __iomem *__waddr = (hwdev)->base + (module_base) + \ + 4 * module_name##__##arr##__##field##_WORD(i); \ + \ + trace_spacemit_dpu_reg_write((u32)(data), (module_base), #field); \ + __dpu_mmio_field_write(__waddr, \ + module_name##__##arr##__##field##_MASK, \ + data); \ +} while (0) + +/* +* Unified CPU/cmdlist field write; a NULL cl_regs selects the direct MMIO path. +*/ +#define _dpu_write_reg (hwdev, module_name, module_base, field, data, cl_regs, ...) \ +do { \ + if ((cl_regs) != NULL) \ + cmdlist_write_reg(hwdev, module_name, module_base, \ + field, data, cl_regs); \ + else \ + dpu_write_reg(hwdev, module_name, module_base, field, \ + data); \ +} while (0) + +#define dpu_write (...) _dpu_write_reg(__VA_ARGS__, NULL) + +/* Unified CPU/cmdlist raw-word write (the value32[] call sites). */ +#define dpu_write_word (hwdev, module_base, word, data, cl_regs) \ +do { \ + if ((cl_regs) != NULL) \ + cmdlist_write_word(module_base, word, data, cl_regs); \ + else \ + dpu_write_reg_word(hwdev, module_base, word, data); \ +} while (0) + +#endif drivers/gpu/drm/spacemit/spacemit_drm.h new file +61
-0@@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#ifndef _SPACEMIT_DRM_H_ +#define _SPACEMIT_DRM_H_ + +#include <drm/drm_print.h> +#include <drm/drm_atomic.h> +#include <drm/drm_drv.h> +#include <drm/drm_vblank.h> +#include <drm/drm_probe_helper.h> +#include <linux/dma-mapping.h> +#include <linux/clk.h> +#include <linux/reset.h> +#include "spacemit_dmmu.h" + +/* The DPU's clock inputs, as named by the binding. */ +struct dpu_clk_context { +struct clk *pxclk; +struct clk *mclk; +struct clk *escclk; +struct clk *aclk; +struct clk *dscclk; +}; + +/** +* struct spacemit_drm_private - Top-level driver state for the SpacemiT DRM +* card +* @ddev: DRM device, created in the component master bind callback; bind-scope, +* see spacemit_kms in spacemit_crtc.c. +* @dev: The DPU platform device; the DPU is the drm subsystem root. +* @a_crtc: Per-DPU CRTC state. +* @hwdev: Per-revision Saturn DPU description and vtable. +* @cmdlist_groups: Pool of per-pipeline cmdlist groups. +* @clk_ctx: The DPU's clocks, acquired once at probe. +* @pipe_resets: The DPU reset lines, in assert order; bulk-deassert +* releases them in reverse. +* @irq_online: Online-compose IRQ; requested disabled, enabled at bind. +*/ +struct spacemit_drm_private { +struct drm_device *ddev; +struct device *dev; +struct spacemit_crtc *a_crtc; +struct spacemit_hw_device *hwdev; +struct cmdlist **cmdlist_groups; + +struct dpu_clk_context clk_ctx; +struct reset_control_bulk_data pipe_resets[5 ]; +int irq_online; +}; + +extern struct drm_driver spacemit_drm_drv; +extern const struct component_master_ops spacemit_drm_master_ops; + +int spacemit_drm_mode_config_init (struct drm_device *drm); +int spacemit_drm_of_component_probe (struct device *dev); + +#endif /* _SPACEMIT_DRM_H_ */
Signature · 6 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)
Re: [PATCH v2 08/17] drm/spacemit: add Saturn DPU core types, cmdlist and display MMU
Hi Thomas,
Quoted 11 lines · Thomas Zimmermann
Hi
Am 09.08.26 um 15:14 schrieb Cody Kang via B4 Relay:
Quoted 7 lines
From: Cody Kang <[email protected]>
Register programming of the Saturn DPU is batched: the driver builds per-module register lists in memory and the hardware command-list engine replays them at frame boundaries, while scanout buffers are mapped through the DPU's private address translation unit (DMMU) rather than scanned out by physical address.
Quoted 3 lines
I've looked through the code in patch 10. How does a plane interact with the hardware? It apparently has its own command list, but there's mostly code for the CRTC update.
Thanks for the review. A plane programs the hardware through a command list. Its atomic_update fills the list with the registers of the plane's read channel, the driver points the command-list engine at it, and the hardware replays it once the driver raises config-ready.
In v2 the plane only fills its list; sorting the lists and handing them to the engine is done in the CRTC update, which is why most of the code is there. v3 will move that into the plane: each plane builds and submits its own list in atomic_update, and the CRTC flush only submits its own list, for the composer, and raises config-ready.
Cody
PATCH v2 9/17 drm/spacemit: add Saturn DPU hardware backend
In reply to Cody KangAdd the register-level programming of one Saturn instance: clock and reset bring-up, scene control and timing generator setup, RDMA channel and composer layer programming, FBC line-buffer budgeting, interrupt dispatch and the cfg-ready/vsync handshake that paces commits. The backend is exposed as an ops table and hardware descriptor to be aggregated by the KMS layer in an upcoming patch.
---
v2:
- drop the dead INT_VSYNC_UPDATE clear; the enum member goes away in patch 08 (Sashiko)
- drop the cmdlist parameter from saturn_hee_crtc_cmdlist(), matching the crtc_cmdlist op change in patch 08
--- drivers/gpu/drm/spacemit/dpu/dpu_saturn.c | 479 +++++++++++ drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c | 896 +++++++++++++++++++++ drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.c | 152 ++++ drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.h | 21 + drivers/gpu/drm/spacemit/dpu/saturn_regs/ops_hee.h | 51 ++ 5 files changed, 1599 insertions(+)
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +479 -0
@@ -0,0 +1,479 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/wait.h> +#include <linux/workqueue.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/module.h> +#include <linux/mfd/syscon.h> +#include <linux/pm_qos.h> +#include <linux/regmap.h> +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/types.h> +#include <linux/math64.h> +#include <drm/drm_print.h> +#include <drm/drm_atomic.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_gem.h> +#include "dpu_saturn.h" +#include "saturn_fbcmem.h" +#include "../spacemit_cmdlist.h" +#include "../spacemit_dmmu.h" +#include "../spacemit_dpu_reg.h" +#include "../spacemit_drm.h" +#include <video/display_timing.h> +#include "../spacemit_dpu_ids.h" +#include "saturn_regs/ops_hee.h" + +#define CREATE_TRACE_POINTS +#include "dpu_trace.h" + +#define TOTAL_RDMA_MEMSIZE (68 * 1024) +static const struct dpu_format_id primary_fmts[] = { + {DRM_FORMAT_XRGB8888 ,8 ,32 },/* RDMA_FMT_XRGB_8888 */ + {DRM_FORMAT_ARGB8888 ,4 ,32 },/* RDMA_FMT_ARGB_8888 */ + {DRM_FORMAT_XBGR8888 ,9 ,32 },/* RDMA_FMT_XBGR_8888 */ + {DRM_FORMAT_ABGR8888 ,5 ,32 },/* RDMA_FMT_ABGR_8888 */ + {DRM_FORMAT_RGBX8888 ,10 ,32 },/* RDMA_FMT_RGBX_8888 */ + {DRM_FORMAT_RGBA8888 ,6 ,32 },/* RDMA_FMT_RGBA_8888 */ + {DRM_FORMAT_BGRX8888 ,11 ,32 },/* RDMA_FMT_BGRX_8888 */ + {DRM_FORMAT_BGRA8888 ,7 ,32 },/* RDMA_FMT_BGRA_8888 */ + {DRM_FORMAT_ABGR2101010 ,1 ,32 },/* RDMA_FMT_ABGR_2101010 */ + {DRM_FORMAT_RGB888 ,12 ,24 },/* RDMA_FMT_RGB_888 */ + {DRM_FORMAT_BGR888 ,13 ,24 },/* RDMA_FMT_BGR_888 */ + {DRM_FORMAT_RGB565 ,22 ,16 },/* RDMA_FMT_RGB_565 */ + {DRM_FORMAT_BGR565 ,23 ,16 },/* RDMA_FMT_BGR_565 */ +}; + +static const struct spacemit_hw_rdma saturn_hee_rdmas[] = { + {FORMAT_RGB }, + {FORMAT_RGB }, + {FORMAT_RGB }, + {FORMAT_RGB }, +}; + +static const u32 saturn_hee_fbcmem_sizes[] = { +89600 ,/* 87.5k */ +15360 ,/* 16k */ +}; + +const struct spacemit_hw_device k3_saturn_dpu = { + .plane_nums =1 , + .crtc_nums =2 , + .rdma_nums =ARRAY_SIZE (saturn_hee_rdmas), + .rdmas = saturn_hee_rdmas, + .n_formats =ARRAY_SIZE (primary_fmts), + .formats = primary_fmts, + .n_fbcmems =ARRAY_SIZE (saturn_hee_fbcmem_sizes), + .fbcmem_sizes = saturn_hee_fbcmem_sizes, + .enable_vsync = saturn_hee_enable_vsync, + .enable_cfg_irq = saturn_hee_enable_cfg_irq, + .cfg_ready = saturn_hee_cfg_ready, + .sw_start = saturn_hee_sw_start, + .irq_enable = saturn_hee_irq_enable, + .dpu_init = saturn_hee_dpu_init, + .plane_update_hw_channel = saturn_hee_plane_update_hw_channel, + .plane_disable_hw_channel = saturn_hee_plane_disable_hw_channel, + .conf_dpuctrl = saturn_hee_conf_dpuctrl, + .get_cfg_rdy = saturn_hee_get_cfg_rdy, + .get_int_sts = saturn_hee_get_int_sts, + .get_irq_bit = saturn_hee_get_irq_bit, + .clr_int_sts = saturn_hee_clr_int_sts, + .enable_cmdlist = saturn_hee_enable_cmdlist, + .cfg_cmdlist = saturn_hee_cfg_cmdlist, + .rdma_dmmu = saturn_hee_rdma_dmmu, + .get_cl_rdma_buf = saturn_hee_get_cl_rdma_buf, + .cmdlist_fill_data_row = saturn_hee_cmdlist_fill_data_row, + .cmdlist_fill_conf_row = saturn_hee_cmdlist_fill_conf_row, + .crtc_cmdlist = saturn_hee_crtc_cmdlist, + .cmdlist_dump_node = saturn_hee_cmdlist_dump_node, +}; + +void saturn_enable_irq_mask (struct spacemit_crtc *a_crtc,bool enable, +u32 offset,u32 mask) +{ +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +if (!hwdev->base) { +drm_err (a_crtc->crtc.dev,"hwdev->base is NULL\n" ); +return ; + } + +if (!a_crtc->clocks_on) +return ; + +regmap_update_bits (hwdev->regmap, offset, mask, enable ? mask :0 ); +} + +int dpu_parse_clocks (struct device *dev,struct dpu_clk_context *clk_ctx) +{ + clk_ctx->pxclk =devm_clk_get (dev,"pxclk" ); +if (IS_ERR (clk_ctx->pxclk)) +return dev_err_probe (dev,PTR_ERR (clk_ctx->pxclk), +"failed to get pxclk\n" ); + + clk_ctx->mclk =devm_clk_get (dev,"mclk" ); +if (IS_ERR (clk_ctx->mclk)) +return dev_err_probe (dev,PTR_ERR (clk_ctx->mclk), +"failed to get mclk\n" ); + + clk_ctx->escclk =devm_clk_get (dev,"escclk" ); +if (IS_ERR (clk_ctx->escclk)) +return dev_err_probe (dev,PTR_ERR (clk_ctx->escclk), +"failed to get escclk\n" ); + + clk_ctx->aclk =devm_clk_get (dev,"aclk" ); +if (IS_ERR (clk_ctx->aclk)) +return dev_err_probe (dev,PTR_ERR (clk_ctx->aclk), +"failed to get aclk\n" ); + + clk_ctx->dscclk =devm_clk_get (dev,"dscclk" ); +if (IS_ERR (clk_ctx->dscclk)) +return dev_err_probe (dev,PTR_ERR (clk_ctx->dscclk), +"failed to get dscclk\n" ); + +return 0 ; +} + +static int dpu_enable_clocks (struct spacemit_crtc *a_crtc) +{ +struct dpu_clk_context *clk_ctx = &a_crtc->clk_ctx; +struct drm_crtc *crtc = &a_crtc->crtc; +struct drm_display_mode *mode = &crtc->mode; +u64 clk_val; +u64 set_clk_val; +int ret; + + ret =clk_prepare_enable (clk_ctx->pxclk); +if (ret) + goto err; + set_clk_val = mode->clock *1000 ; +if (set_clk_val) { + set_clk_val =clk_round_rate (clk_ctx->pxclk, set_clk_val); + clk_val =clk_get_rate (clk_ctx->pxclk); +if (clk_val != set_clk_val) { +clk_set_rate (clk_ctx->pxclk, set_clk_val); +drm_dbg (crtc->dev,"pxclk=%lld\n" , clk_val); + } + } + + ret =clk_prepare_enable (clk_ctx->mclk); +if (ret) + goto err_pxclk; + clk_val =clk_get_rate (clk_ctx->mclk); +if (clk_val !=DPU_MCLK_DEFAULT ) { + clk_val =clk_round_rate (clk_ctx->mclk,DPU_MCLK_DEFAULT ); +clk_set_rate (clk_ctx->mclk, clk_val); +drm_dbg (crtc->dev,"mclk=%lld\n" , clk_val); + } + +/* The escape clock only has to run for the "esc" reset to propagate. */ + ret =clk_prepare_enable (clk_ctx->escclk); +if (ret) + goto err_mclk; + + ret =clk_prepare_enable (clk_ctx->aclk); +if (ret) + goto err_escclk; + clk_val =clk_get_rate (clk_ctx->aclk); +if (clk_val != a_crtc->aclk) { + set_clk_val =clk_round_rate (clk_ctx->aclk, a_crtc->aclk); +if (set_clk_val != clk_val) { +clk_set_rate (clk_ctx->aclk, set_clk_val); +drm_dbg (crtc->dev,"aclk %llu -> %llu\n" , clk_val, + set_clk_val); + } + } + + ret =clk_prepare_enable (clk_ctx->dscclk); +if (ret) + goto err_aclk; + +trace_dpu_enable_clocks (a_crtc->dev_id); +return 0 ; + +err_aclk: +clk_disable_unprepare (clk_ctx->aclk); +err_escclk: +clk_disable_unprepare (clk_ctx->escclk); +err_mclk: +clk_disable_unprepare (clk_ctx->mclk); +err_pxclk: +clk_disable_unprepare (clk_ctx->pxclk); +err: +drm_err (crtc->dev,"failed to enable DPU clocks: %d\n" , ret); +return ret; +} + +static int dpu_disable_clocks (struct spacemit_crtc *a_crtc) +{ +struct dpu_clk_context *clk_ctx = &a_crtc->clk_ctx; + +trace_dpu_disable_clocks (a_crtc->dev_id); + +clk_disable_unprepare (clk_ctx->pxclk); +clk_disable_unprepare (clk_ctx->mclk); +clk_disable_unprepare (clk_ctx->escclk); + +clk_disable_unprepare (clk_ctx->aclk); +clk_disable_unprepare (clk_ctx->dscclk); + +return 0 ; +} + +u8 spacemit_plane_hw_get_format_id (u32 format) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (primary_fmts); i++) { +if (primary_fmts[i].format == format) +return primary_fmts[i].id; + } + +return SPACEMIT_DPU_INVALID_FORMAT_ID ; +} + +static void saturn_enable_vsync (struct spacemit_crtc *a_crtc,bool enable) +{ +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +trace_saturn_enable_vsync ("vsync" , enable); + hwdev->enable_vsync (a_crtc, hwdev, enable); +} + +void spacemit_cfg_rdy_timer_handler (struct timer_list *t) +{ +struct spacemit_crtc *a_crtc =timer_container_of (a_crtc, t, + cfg_rdy_timer); +struct drm_crtc *crtc = &a_crtc->crtc; +struct drm_device *drm = crtc->dev; +struct drm_pending_vblank_event *event; +unsigned long flags; + +drm_err_ratelimited (drm,"CFG_RDY handshake timeout\n" ); +trace_saturn_ctrl_cfg_ready_timer (a_crtc->dev_id); + + a_crtc->flip_done = true; + +spin_lock_irqsave (&drm->event_lock, flags); + event = crtc->state->event; +if (event) { + crtc->state->event =NULL ; +drm_crtc_send_vblank_event (crtc, event); + } +spin_unlock_irqrestore (&drm->event_lock, flags); + +drm_crtc_vblank_put (crtc); +} + +static void saturn_ctrl_cfg_ready (struct spacemit_crtc *a_crtc,bool enable) +{ +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +trace_saturn_ctrl_cfg_ready (a_crtc->dev_id, enable); +mod_timer (&a_crtc->cfg_rdy_timer, jiffies +msecs_to_jiffies (3000 )); + hwdev->cfg_ready (a_crtc, hwdev); +} + +static void saturn_ctrl_sw_start (struct spacemit_crtc *a_crtc,bool enable) +{ +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +trace_saturn_ctrl_sw_start (a_crtc->dev_id, enable); + + hwdev->sw_start (a_crtc, hwdev); +} + +static int dpu_init (struct spacemit_crtc *a_crtc) +{ +unsigned int timeout =1000 ; +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +if (!a_crtc->clocks_on) +return 0 ; + +while (timeout) { +if (hwdev->get_cfg_rdy (a_crtc, hwdev) ==0 ) +break ; +usleep_range (100 ,200 ); + timeout--; + } +if (timeout ==0 ) +drm_err (a_crtc->crtc.dev,"wait for cfg ready timed out\n" ); + + hwdev->dpu_init (a_crtc); + +return 0 ; +} + +static void dpu_uninit (struct spacemit_crtc *a_crtc) +{ +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +if (!a_crtc->clocks_on) +return ; + +trace_dpu_uninit (a_crtc->dev_id); + hwdev->irq_enable (a_crtc, false); +} + +static inline void dpu_isr_vblank (struct spacemit_crtc *a_crtc,bool *flip) +{ +struct drm_crtc *crtc = &a_crtc->crtc; +struct drm_device *drm = crtc->dev; +struct drm_pending_vblank_event *event; + +drm_crtc_handle_vblank (crtc); + +if (*flip) +return ; + *flip = true; + +/* +* event_lock serialises this against the commit arming +* crtc->state->event. +*/ +spin_lock (&drm->event_lock); + event = crtc->state->event; +if (event) { +/* +* Consume it exactly once, even against a concurrent +* commit_hw_done(). +*/ + crtc->state->event =NULL ; +drm_crtc_send_vblank_event (crtc, event); + } +spin_unlock (&drm->event_lock); + +drm_crtc_vblank_put (crtc); +} + +u32 saturn_conf_dpuctrl_rdma (struct spacemit_crtc *a_crtc) +{ +struct drm_crtc *crtc = &a_crtc->crtc; +struct drm_plane *plane; +u32 rdma_en =0 ; + +drm_atomic_crtc_for_each_plane (plane, crtc) { +u32 rdma_id =to_spacemit_plane_state (plane->state)->rdma_id; + +if (rdma_id !=RDMA_INVALID_ID ) + rdma_en |= (1 << rdma_id); + } + +trace_dpuctrl ("rdma_en" , rdma_en); + +return rdma_en; +} + +static u32 dpu_online_isr (struct spacemit_crtc *a_crtc) +{ +u32 irq_raw, irq_bit, irq_ur_bit; +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +int dev_id = a_crtc->dev_id; + +trace_dpu_isr (a_crtc->dev_id); + + irq_raw = hwdev->get_int_sts (hwdev, dev_id); +trace_dpu_isr_status ("ONLINE" , irq_raw); + irq_bit = hwdev->get_irq_bit (INT_UNDERRUN , dev_id); + irq_ur_bit = irq_raw & irq_bit; +if (irq_ur_bit && !a_crtc->ur_reported) { + hwdev->clr_int_sts (a_crtc, irq_ur_bit, dev_id); +trace_dpu_isr_status ("underrun" , irq_ur_bit); +drm_err_ratelimited (a_crtc->crtc.dev,"underrun\n" ); + a_crtc->ur_reported = true; + } + irq_bit = hwdev->get_irq_bit (INT_CFG_RDY , dev_id); +if (irq_raw & irq_bit) { + hwdev->clr_int_sts (a_crtc, irq_bit, dev_id); +trace_dpu_isr_status ("cfg_rdy_clr" , irq_raw & irq_bit); +/* +* A fired watchdog already sent the event and put this flip's +* vblank reference; re-arming the vsync path would put twice. +*/ +if (timer_delete (&a_crtc->cfg_rdy_timer)) + a_crtc->flip_done = false; + a_crtc->ur_reported = false; +if (hwdev->enable_cfg_irq) + hwdev->enable_cfg_irq (a_crtc, hwdev, false); + } + irq_bit = hwdev->get_irq_bit (INT_VSYNC , dev_id); +if (irq_raw & irq_bit) { + hwdev->clr_int_sts (a_crtc, irq_bit, dev_id); +trace_dpu_isr_status ("vsync" , irq_raw & irq_bit); +dpu_isr_vblank (a_crtc, &a_crtc->flip_done); + } + irq_bit = hwdev->get_irq_bit (INT_REST , dev_id) | irq_ur_bit; +if (irq_raw & irq_bit) + hwdev->clr_int_sts (a_crtc, irq_bit, dev_id); + +return 0 ; +} + +static void dpu_run (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +trace_dpu_run (a_crtc->dev_id); + +if (hwdev->conf_dpuctrl) + hwdev->conf_dpuctrl (crtc, old_state); + +/* flush all config register writes before CFG_RDY is raised */ +mb (); + +drm_crtc_vblank_get (crtc); +if (hwdev->enable_cfg_irq) + hwdev->enable_cfg_irq (a_crtc, hwdev, true); + +saturn_ctrl_cfg_ready (a_crtc, true); + +if (unlikely (a_crtc->is_1st_f)) { +drm_dbg (a_crtc->crtc.dev,"DPU start\n" ); + a_crtc->is_1st_f = false; +saturn_ctrl_sw_start (a_crtc, true); + } +dma_rmb (); +} + +static void dpu_enable_vsync (struct spacemit_crtc *a_crtc) +{ +saturn_enable_vsync (a_crtc, true); +} + +static void dpu_disable_vsync (struct spacemit_crtc *a_crtc) +{ +saturn_enable_vsync (a_crtc, false); +} + +const struct dpu_core_ops dpu_saturn_ops = { + .init = dpu_init, + .uninit = dpu_uninit, + .run = dpu_run, + .online_isr = dpu_online_isr, + .enable_clk = dpu_enable_clocks, + .disable_clk = dpu_disable_clocks, + .enable_vsync = dpu_enable_vsync, + .disable_vsync = dpu_disable_vsync, + .cal_layer_fbcmem_size = saturn_cal_layer_fbcmem_size, + .adjust_rdma_fbcmem = saturn_adjust_rdma_fbcmem, +};
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c new file +896 -0
896 lines not on this page · raw message
drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.c new file +152 -0
152 lines not on this page · raw message
drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _SATURN_FBCMEM_H_ +#define _SATURN_FBCMEM_H_ + +#include <drm/drm_plane.h> +#include "../spacemit_crtc.h" +#include "../spacemit_dpu_reg.h" +#include "dpu_saturn.h" + +#define FBCMEM_UNIT (32)/* fbcmem is 32 bytes per unit */ + +int get_raw_data_plane_rdma_mem_size (u32 drm_4cc_fmt,u32 plane_crop_width, +u32 *output_mem_size); + +int saturn_cal_layer_fbcmem_size (struct drm_plane *plane, +struct drm_plane_state *state); + +int saturn_adjust_rdma_fbcmem (struct spacemit_hw_device *hwdev, +struct spacemit_crtc_rdma *rdmas); + +#endif
drivers/gpu/drm/spacemit/dpu/saturn_regs/ops_hee.h new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 09/17] drm/spacemit: add Saturn DPU hardware backend
Thank you for your contribution! Sashiko AI review found 14 potential issue(s) to consider: - [High] Dynamic memory allocation using GFP_KERNEL inside plane atomic update, disable, and CRTC flush…
Thank you for your contribution! Sashiko AI review found 14 potential issue(s) to consider:
- [High] Dynamic memory allocation using GFP_KERNEL inside plane atomic update, disable, and CRTC flush paths.
- [High] If cmdlist memory allocation fails, the driver falls back to direct MMIO writes during atomic updates, breaking transaction semantics.
- [High] Unsynchronized lockless access to flip_done between ISR and timer handler allows double drm_crtc_vblank_put().
- [High] Dereferencing state->fb without checking for NULL causes a crash when configuring pixel blending for solid fill planes.
- [High] Potential NULL pointer dereference of state->fb in saturn_cal_layer_fbcmem_size.
- [High] The dpu_init function uses the sleeping function usleep_range() while executing from an atomic commit path.
- [High] The cfg_rdy_timer is not synchronously cancelled during device teardown, leading to a potential use-after-free.
- [High] The VBLANK ISR and timer handler directly access crtc->state->event, causing a race condition with concurrent atomic commits.
- [High] Silently dropped cmdlist rows cause the hardware DMA to read out-of-bounds memory.
- [Medium] Hardware clocks are disabled in the same forward order they were enabled, violating clock dependencies.
- [Medium] C bitfields are used for defining hardware DMA descriptor layouts.
- [Medium] Unchecked drm_crtc_vblank_get return value leads to refcount underflow.
- [Medium] Double-clearing of underrun interrupt status due to stale irq_raw snapshot.
- [Medium] Useless and contextually incorrect read memory barrier (dma_rmb).
--
--- Patch [9]: [PATCH v2 09/17] drm/spacemit: add Saturn DPU hardware backend --- commit 203a676effd210733651accaca4eebc02e32d9c2
Author: Cody Kang <[email protected]>
Subject: drm/spacemit: add Saturn DPU hardware backend
This commit adds the register-level programming of the Saturn instance, including clock and reset bring-up, scene control, and timing generator setup. The backend is exposed as an ops table for the KMS layer.
Quoted 3 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +0
-0
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 228
Quoted 12 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +12
-0+static int dpu_disable_clocks (struct spacemit_crtc *a_crtc) +{ +struct dpu_clk_context *clk_ctx = &a_crtc->clk_ctx; + +trace_dpu_disable_clocks (a_crtc->dev_id); + +clk_disable_unprepare (clk_ctx->pxclk); +clk_disable_unprepare (clk_ctx->mclk); +clk_disable_unprepare (clk_ctx->escclk); + +clk_disable_unprepare (clk_ctx->aclk); +clk_disable_unprepare (clk_ctx->dscclk);
[Severity: Medium]
Providers should usually be disabled after their consumers, but this matches the exact forward order they were enabled in dpu_enable_clocks().
Are these clocks being disabled in the correct order?
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 311
Quoted 13 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +13
-0+static int dpu_init (struct spacemit_crtc *a_crtc) +{ +unsigned int timeout =1000 ; +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +if (!a_crtc->clocks_on) +return 0 ; + +while (timeout) { +if (hwdev->get_cfg_rdy (a_crtc, hwdev) ==0 ) +break ; +usleep_range (100 ,200 );
[Severity: High]dpu_init() appears to be called from the CRTC's atomic enable sequence, where sleeping is strictly forbidden and can cause kernel warnings or deadlocks.
Is it safe to call a sleeping function like usleep_range() here?
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 332
Quoted 11 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +11
-0+static void dpu_uninit (struct spacemit_crtc *a_crtc) +{ +struct spacemit_drm_private *priv = a_crtc->crtc.dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; + +if (!a_crtc->clocks_on) +return ; + +trace_dpu_uninit (a_crtc->dev_id); + hwdev->irq_enable (a_crtc, false); +}
[Severity: High]
If the driver unbinds while the timer is pending, the timer callback could execute on freed spacemit_crtc memory, leading to a use-after-free.
Should there be a synchronous cancellation of cfg_rdy_timer here?
[ ... ]
Quoted 9 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +9
-0+static inline void dpu_isr_vblank (struct spacemit_crtc *a_crtc,bool *flip) +{ +struct drm_crtc *crtc = &a_crtc->crtc; +struct drm_device *drm = crtc->dev; +struct drm_pending_vblank_event *event; + +drm_crtc_handle_vblank (crtc); + +if (*flip)
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 352
Quoted 10 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +10
-0+return ; + *flip = true; + +/* +* event_lock serialises this against the commit arming +* crtc->state->event. +*/ +spin_lock (&drm->event_lock); + event = crtc->state->event; +if (event) {
[Severity: High]
The crtc->state can be swapped asynchronously by drm_atomic_helper_swap_state(), which could cause this handler to point to a new event and lose the old one if multiple commits are queued rapidly.
Is it safe to directly dereference crtc->state->event dynamically from an asynchronous context?
[ ... ]
Quoted 2 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +2
-0+static u32 dpu_online_isr (struct spacemit_crtc *a_crtc) +{
[ ... ]
Quoted 10 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +10
-0+ irq_raw = hwdev->get_int_sts (hwdev, dev_id); +trace_dpu_isr_status ("ONLINE" , irq_raw); + irq_bit = hwdev->get_irq_bit (INT_UNDERRUN , dev_id); + irq_ur_bit = irq_raw & irq_bit; +if (irq_ur_bit && !a_crtc->ur_reported) { + hwdev->clr_int_sts (a_crtc, irq_ur_bit, dev_id); +trace_dpu_isr_status ("underrun" , irq_ur_bit); +drm_err_ratelimited (a_crtc->crtc.dev,"underrun\n" ); + a_crtc->ur_reported = true; + }
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 411
Quoted 10 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +10
-0+ irq_bit = hwdev->get_irq_bit (INT_CFG_RDY , dev_id); +if (irq_raw & irq_bit) { + hwdev->clr_int_sts (a_crtc, irq_bit, dev_id); +trace_dpu_isr_status ("cfg_rdy_clr" , irq_raw & irq_bit); +/* +* A fired watchdog already sent the event and put this flip's +* vblank reference; re-arming the vsync path would put twice. +*/ +if (timer_delete (&a_crtc->cfg_rdy_timer)) + a_crtc->flip_done = false;
[Severity: High]
If the timer executes on another CPU, timer_delete() returns 0 and both the ISR and the timer handler could execute lockless modifications to flip_done and call drm_crtc_vblank_put() twice.
Could this non-synchronous timer cancellation leave the callback running concurrently?
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 424
Quoted 3 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +3
-0+ irq_bit = hwdev->get_irq_bit (INT_REST , dev_id) | irq_ur_bit; +if (irq_raw & irq_bit) + hwdev->clr_int_sts (a_crtc, irq_bit, dev_id);
[Severity: Medium]
The code takes a single snapshot of irq_raw at the start of the ISR, clears irq_ur_bit if present, and then clears it again here using the stale snapshot. A new underrun firing in that window could be cleared without being processed.
Does double-clearing the underrun interrupt status risk losing interrupts?
[ ... ]
Quoted 3 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +3
-0+static void dpu_run (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 444
Quoted 4 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +4
-0+/* flush all config register writes before CFG_RDY is raised */ +mb (); + +drm_crtc_vblank_get (crtc);
[Severity: Medium]
If getting the vblank fails, the reference is not taken, but the ISR still unconditionally calls drm_crtc_vblank_put(), which can lead to a vblank reference count underflow.
Should the return value of drm_crtc_vblank_get() be checked?
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c line 456
Quoted 12 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn.c new file +12
-0+if (hwdev->enable_cfg_irq) + hwdev->enable_cfg_irq (a_crtc, hwdev, true); + +saturn_ctrl_cfg_ready (a_crtc, true); + +if (unlikely (a_crtc->is_1st_f)) { +drm_dbg (a_crtc->crtc.dev,"DPU start\n" ); + a_crtc->is_1st_f = false; +saturn_ctrl_sw_start (a_crtc, true); + } +dma_rmb (); +}
[Severity: Medium]
A read memory barrier strictly enforces ordering between CPU reads, but the preceding operation writes to DMA control registers to start the engine.
Is this read memory barrier required here? It seems semantically out of place.
Quoted 3 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c new file +0
-0
[ ... ]
Quoted 2 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c new file +2
-0+void saturn_hee_plane_update_hw_channel (struct drm_plane *plane) +{
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c line 441
Quoted 2 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c new file +2
-0+if (state->fb->format && state->fb->format->has_alpha && + pixel_alpha !=DRM_MODE_BLEND_PIXEL_NONE ) {
[Severity: High]
For solid fill planes, state->fb is typically NULL. Evaluating state->fb->format without a NULL check could cause a kernel oops when userspace submits an atomic commit for a solid-color plane.
Can state->fb be NULL here?
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c line 457
Quoted 7 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c new file +7
-0+ cl_cmp =alloc_cmdlist_regs (CMPS_X_REG ); + + base =CMP_BASE_ADDR [a_crtc->dev_id]; +dpu_write (hwdev,CMPS_X_REG , base, dst_w, mode->hdisplay, cl_cmp); +dpu_write (hwdev,CMPS_X_REG , base, dst_h, mode->vdisplay, cl_cmp); + +SATURN_WRITE_COMPOSER_LAYER (00 );
[Severity: High]
The alloc_cmdlist_regs macro internally uses kzalloc with GFP_KERNEL.
Can this allocation sleep in an atomic context and trigger deadlock warnings, since it is called from the plane atomic update callback?
Also, if this allocation fails and returns NULL, cl_cmp is passed directly to SATURN_WRITE_COMPOSER_LAYER and dpu_write. The dpu_write logic falls back to direct MMIO writes when the command list is NULL.
Does this bypass command list synchronization to VBLANK and risk applying partial state immediately?
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c line 694
Quoted 13 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c new file +13
-0+struct cmdlist_header { +u64 next_list_addr :39 ; +/* reserved */ + u32: 1; +u32 nod_len :16 ; +/* 1: the last cmdlist node, 2: pending node, otherwise 0 */ +u32 nod_type :2 ; +u32 next_nod_secu :1 ; +u64 wait_event_low :5 ; +u64 wait_event :59 ; +/* reserved */ + u32: 5; +};
[Severity: Medium]
Bitfield packing and ordering are heavily compiler and architecture dependent, which might produce incorrect structures in memory for the hardware DMA to read.
Is it safe to use C bitfields for hardware DMA descriptor layouts?
[ ... ]
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c line 728
Quoted 12 lines
drivers/gpu/drm/spacemit/dpu/dpu_saturn_hee.c new file +12
-0+void saturn_hee_cmdlist_fill_data_row (struct cmdlist *cl,u32 strobe, +u32 offset,u32 value[]) +{ +struct cmdlist_row *row; +u8 i; + +/* +* packing counts rows blindly; drop the row rather than the buffer end +*/ +if (WARN_ONCE (CL_HEADER_SZ + (cl->nod_len +1 ) *CL_ROW_SZ > cl->size, +"cmdlist buffer full (rows %u)\n" , cl->nod_len)) +return ;
[Severity: High]
Since this function silently drops the row and returns void, the caller cmdlist_regs_packing() will blindly increment cl->nod_len regardless of buffer truncation.
Could this inflated length cause the DMA engine to read past the end of the initialized buffer?
Quoted 3 lines
drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.c new file +0
-0
[ ... ]
drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.c line 40
Quoted 5 lines
drivers/gpu/drm/spacemit/dpu/saturn_fbcmem.c new file +5
-0+int saturn_cal_layer_fbcmem_size (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct spacemit_plane_state *pstate =to_spacemit_plane_state (state); +u32 drm_4cc_fmt = pstate->state.fb->format->format;
[Severity: High]
If a plane is being disabled or is in a solid fill mode, the framebuffer pointer will be NULL, which would cause an immediate crash during the atomic check phase.
Is it guaranteed that pstate->state.fb is non-NULL here?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=9
PATCH v2 10/17 drm/spacemit: add Saturn DPU KMS pipeline
In reply to Cody KangAdd the atomic KMS implementation on top of the hardware backend: one CRTC and one primary plane per DPU instance. atomic_check validates the plane rectangle 1:1 against the mode and sizes the per-channel FBC line buffer; atomic commit builds the cmdlist batches, maps the framebuffer through the DMMU and arms the cfg-ready handshake, with vblank events driven from the DPU interrupt.
---
v2:
- put all five DPU reset lines behind one reset_control_bulk_* pair (Philipp Zabel, Guodong Xu)
- keep the online IRQ alive across drm_dev_unregister() and drm_atomic_helper_shutdown() in unbind (Sashiko)
- free the per-state DMA buffers in the plane .reset path instead of bypassing the custom state destructor (Sashiko)
- release the duplicated state's references on the rdmas allocation failure path in crtc duplicate_state (Sashiko)
- set clocks_on only after dpu_pm_resume() has enabled the clocks (Sashiko)
--- drivers/gpu/drm/spacemit/spacemit_crtc.c | 786 +++++++++++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_planes.c | 377 ++++++++++++++ 2 files changed, 1163 insertions(+)
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +786 -0
@@ -0,0 +1,786 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#include <drm/drm_print.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_managed.h> +#include <drm/clients/drm_client_setup.h> +#include <linux/aperture.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/component.h> +#include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/pm_qos.h> +#include <linux/property.h> +#include <linux/mutex.h> +#include <linux/string.h> +#include <linux/trace_events.h> +#include <linux/of_platform.h> +#include <linux/regmap.h> +#include "spacemit_dpu_ids.h" +#include <linux/reset.h> +#include "spacemit_cmdlist.h" +#include "spacemit_dmmu.h" +#include "spacemit_drm.h" +#include "spacemit_crtc.h" +#include "dpu/dpu_saturn.h" +#include "dpu/dpu_trace.h" + +static int spacemit_crtc_init (struct spacemit_crtc *a_crtc); +static int spacemit_crtc_uninit (struct spacemit_crtc *a_crtc); +static int dpu_pm_suspend (struct device *dev); +static int dpu_pm_resume (struct device *dev); + +static void saturn_count_rdma_use (struct drm_crtc_state *crtc_state) +{ +struct drm_plane *plane; +struct spacemit_crtc_state *spacemit_state = +to_spacemit_crtc_state (crtc_state); +struct spacemit_crtc_rdma *rdmas = spacemit_state->rdmas; +u32 rdma_id =0 ; +const struct drm_plane_state *pstate; + +drm_atomic_crtc_state_for_each_plane_state (plane, pstate, crtc_state) { + rdma_id =to_spacemit_plane_state (pstate)->rdma_id; +if (rdma_id !=RDMA_INVALID_ID ) + rdmas[rdma_id].use_cnt++; + } +} + +static int spacemit_crtc_atomic_check_fbmem (struct drm_crtc *crtc, +struct drm_crtc_state *crtc_state) +{ +struct spacemit_crtc_rdma *rdmas = +to_spacemit_crtc_state (crtc_state)->rdmas; +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +const struct drm_plane_state *pstate; +struct drm_plane *plane; + +drm_atomic_crtc_state_for_each_plane_state (plane, pstate, crtc_state) { +u32 rdma_id =to_spacemit_plane_state (pstate)->rdma_id; +u32 layer_fbcmem_size = +to_spacemit_plane_state (pstate)->fbcmem_size; + +if (rdma_id !=RDMA_INVALID_ID ) + rdmas[rdma_id].fbcmem.size =max (layer_fbcmem_size, + rdmas[rdma_id].fbcmem.size); + } + +return a_crtc->core->adjust_rdma_fbcmem (hwdev, rdmas); +} + +static void spacemit_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_commit *old_state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct spacemit_drm_private *priv = crtc->dev->dev_private; +int idx; +int ret; + +if (!drm_dev_enter (crtc->dev, &idx)) +return ; + +trace_spacemit_crtc_atomic_enable (a_crtc->dev_id); + +/* +* U-Boot leaves its boot-logo pipeline running. Hard-stop it with the +* resets alone; the clocks are not ours to gate until we have enabled +* them. +*/ +if (unlikely (a_crtc->first_modeset)) { + ret =reset_control_bulk_assert (ARRAY_SIZE (priv->pipe_resets), + priv->pipe_resets); +if (ret) +dev_warn (a_crtc->dev, +"failed to assert resets: %d\n" , ret); +usleep_range (10000 ,20000 ); + a_crtc->first_modeset = false; + } + +if (!a_crtc->clocks_on) { +dpu_pm_resume (a_crtc->dev); + a_crtc->clocks_on = true; + +/* +* The DPU must settle after reset deassert or CFG_RDY races +* the flush. +*/ +usleep_range (10000 ,20000 ); + } + +drm_crtc_vblank_on (&a_crtc->crtc); + +spacemit_crtc_init (a_crtc); + +drm_dev_exit (idx); +} + +static void spacemit_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_commit *old_state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct drm_device *drm = a_crtc->crtc.dev; +int idx; + +if (!drm_dev_enter (drm, &idx)) +return ; + +trace_spacemit_crtc_atomic_disable (a_crtc->dev_id); + +spacemit_crtc_uninit (a_crtc); + +drm_crtc_vblank_off (&a_crtc->crtc); + +/* +* MMIO on a clock-gated DPU stalls the bus, so an in-flight handler +* must finish its status reads before dpu_pm_suspend() gates the +* clocks. +*/ +if (a_crtc->irq_online >0 ) +synchronize_irq (a_crtc->irq_online); + +/* +* Nothing else cancels the watchdog; it would fire against freed state. +*/ +timer_delete_sync (&a_crtc->cfg_rdy_timer); + +/* Close the ISR's MMIO gate before the clocks actually stop. */ + a_crtc->clocks_on = false; +dpu_pm_suspend (a_crtc->dev); + +spin_lock_irq (&drm->event_lock); +if (crtc->state->event) { +drm_crtc_send_vblank_event (crtc, crtc->state->event); + crtc->state->event =NULL ; + } +spin_unlock_irq (&drm->event_lock); + +drm_dev_exit (idx); +} + +static int spacemit_crtc_atomic_check (struct drm_crtc *crtc, +struct drm_atomic_commit *atomic_state) +{ +struct drm_crtc_state *state = +drm_atomic_get_new_crtc_state (atomic_state, crtc); +struct spacemit_crtc_state *cstate =to_spacemit_crtc_state (state); +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +int ret =0 ; + +trace_spacemit_crtc_atomic_check (a_crtc->dev_id); + + ret =spacemit_crtc_atomic_check_fbmem (crtc, state); +if (ret) { +drm_dbg_kms (crtc->dev, +"failed to satisfy fbcmem size for all rdmas\n" ); +return ret; + } + +saturn_count_rdma_use (state); + + ret =spacemit_cmdlist_alloc (a_crtc->dev, &cstate->cl); +if (ret) +return ret; + +return 0 ; +} + +static void spacemit_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_commit *state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_atomic_begin (a_crtc->dev_id); +} + +static void spacemit_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_commit *state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct drm_crtc_state *old_state =drm_atomic_get_old_crtc_state (state, + crtc); +int idx; + +if (!drm_dev_enter (crtc->dev, &idx)) +return ; + +trace_spacemit_crtc_atomic_flush (a_crtc->dev_id); + +spacemit_crtc_run (crtc, old_state); + +drm_dev_exit (idx); +} + +static struct drm_crtc_state * +spacemit_crtc_duplicate_state (struct drm_crtc *crtc) +{ +struct spacemit_crtc_state *state; +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +u8 n_rdma; + +if (WARN_ON (!crtc->state)) +return NULL ; + + state =kzalloc_obj (*state); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + n_rdma = hwdev->rdma_nums; + state->rdmas =kzalloc_objs (*state->rdmas, n_rdma); +if (!state->rdmas) { +__drm_atomic_helper_crtc_destroy_state (&state->base); +kfree (state); +return NULL ; + } + + state->cl.type =CMDLIST_CRTC ; + +return &state->base; +} + +static void spacemit_crtc_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct spacemit_crtc_state *spacemit_state =NULL ; +struct spacemit_crtc *a_crtc =NULL ; + +if (state) { + spacemit_state =to_spacemit_crtc_state (state); +__drm_atomic_helper_crtc_destroy_state (state); + a_crtc =to_spacemit_crtc (crtc); +if (spacemit_state->cl.va) +dma_free_coherent (a_crtc->dev, + spacemit_state->cl.size, + spacemit_state->cl.va, + spacemit_state->cl.pa); +kfree (spacemit_state->rdmas); +kfree (spacemit_state); + } +} + +static void spacemit_crtc_reset (struct drm_crtc *crtc) +{ +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct spacemit_crtc_state *state; + +if (crtc->state) +spacemit_crtc_destroy_state (crtc, crtc->state); + + state =kzalloc_obj (*state); +if (!state) { +__drm_atomic_helper_crtc_reset (crtc,NULL ); +return ; + } + + state->rdmas =kzalloc_objs (*state->rdmas, hwdev->rdma_nums); +if (!state->rdmas) { +kfree (state); +__drm_atomic_helper_crtc_reset (crtc,NULL ); +return ; + } + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static int spacemit_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_enable_vblank (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->enable_vsync) + a_crtc->core->enable_vsync (a_crtc); + +return 0 ; +} + +static void spacemit_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_disable_vblank (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->disable_vsync) + a_crtc->core->disable_vsync (a_crtc); +} + +static const struct drm_crtc_helper_funcs spacemit_crtc_helper_funcs = { + .atomic_check = spacemit_crtc_atomic_check, + .atomic_begin = spacemit_crtc_atomic_begin, + .atomic_flush = spacemit_crtc_atomic_flush, + .atomic_enable = spacemit_crtc_atomic_enable, + .atomic_disable = spacemit_crtc_atomic_disable, +}; + +static const struct drm_crtc_funcs spacemit_crtc_funcs = { + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .reset = spacemit_crtc_reset, + .atomic_duplicate_state = spacemit_crtc_duplicate_state, + .atomic_destroy_state = spacemit_crtc_destroy_state, + .enable_vblank = spacemit_crtc_enable_vblank, + .disable_vblank = spacemit_crtc_disable_vblank, +}; + +static void spacemit_crtc_put_port (struct drm_device *drm,void *port) +{ +of_node_put (port); +} + +static int spacemit_crtc_bind_init (struct drm_device *drm,struct drm_crtc *crtc, +struct drm_plane *primary,struct device_node *port) +{ +int err; + +/* +* drm_of_find_possible_crtcs() walks crtc->port for the life of the +* drm_device. +*/ + crtc->port =of_node_get (port); + err =drmm_add_action_or_reset (drm, spacemit_crtc_put_port, port); +if (err) +return err; + + err =drm_crtc_init_with_planes (drm, crtc, primary,NULL , + &spacemit_crtc_funcs,NULL ); +if (err) { +drm_err (drm,"failed to init crtc\n" ); +return err; + } + +drm_mode_crtc_set_gamma_size (crtc,256 ); + +drm_crtc_helper_add (crtc, &spacemit_crtc_helper_funcs); + +return 0 ; +} + +int spacemit_crtc_run (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_run (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->run) + a_crtc->core->run (crtc, old_state); + +return 0 ; +} + +static int spacemit_crtc_init (struct spacemit_crtc *a_crtc) +{ +trace_spacemit_crtc_init (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->init) + a_crtc->core->init (a_crtc); + + a_crtc->is_1st_f = true; + +return 0 ; +} + +static int spacemit_crtc_uninit (struct spacemit_crtc *a_crtc) +{ +trace_spacemit_crtc_uninit (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->uninit) + a_crtc->core->uninit (a_crtc); + +return 0 ; +} + +static irqreturn_t spacemit_dpu_isr (int irq,void *data) +{ +struct spacemit_drm_private *priv = data; +struct spacemit_crtc *a_crtc = priv->a_crtc; +int idx; + +if (!a_crtc) +return IRQ_NONE ; + +if (!drm_dev_enter (a_crtc->crtc.dev, &idx)) +return IRQ_NONE ; + +/* Reading a clock-gated DPU's status registers stalls the bus. */ +if (unlikely (!a_crtc->clocks_on)) { +drm_dev_exit (idx); +return IRQ_NONE ; + } + +if (a_crtc->core && a_crtc->core->online_isr) + a_crtc->core->online_isr (a_crtc); + +drm_dev_exit (idx); + +return IRQ_HANDLED ; +} + +/* +* Acquire at probe, not at bind: the aggregate can rebind without this device +* detaching, and the exclusive resets would not be handed out a second time. +*/ +static int spacemit_dpu_hw_resources_init (struct spacemit_drm_private *priv, +struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +int n_rstc; +int ret; + + ret =dpu_parse_clocks (dev, &priv->clk_ctx); +if (ret) +return ret; + + priv->pipe_resets[0 ].id ="lcd" ; + priv->pipe_resets[1 ].id ="esc" ; + priv->pipe_resets[2 ].id ="mclk" ; + priv->pipe_resets[3 ].id ="aclk" ; + priv->pipe_resets[4 ].id ="dsc" ; + n_rstc =ARRAY_SIZE (priv->pipe_resets); + ret =devm_reset_control_bulk_get_optional_exclusive (dev, n_rstc, + priv->pipe_resets); +if (ret) +return dev_err_probe (dev, ret,"failed to get resets\n" ); + + priv->irq_online =platform_get_irq_byname (pdev,"online" ); +if (priv->irq_online <0 ) +return priv->irq_online; + +/* +* Keep the line disabled until bind: the handler needs bind-created +* state, and a bootloader-left display can raise an interrupt during +* probe. +*/ + ret =devm_request_irq (dev, priv->irq_online, spacemit_dpu_isr, +IRQF_NO_AUTOEN ,"DPU_ONLINE" , priv); +if (ret) +return dev_err_probe (dev, ret, +"failed to request online IRQ\n" ); + +return 0 ; +} + +static const struct regmap_config spacemit_dpu_regmap_config = { + .name ="dpu" , + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , + .max_register =0x53ffc ,/* 0x54000-byte DPU MMIO from binding */ +}; + +/* Bind-scope wrapper so devm_drm_dev_alloc has a struct to embed into. */ +struct spacemit_kms { +struct drm_device drm; +}; + +static int spacemit_drm_master_bind (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct device_node *np = dev->of_node; +struct device_node *ports =NULL , *port =NULL ; +struct spacemit_crtc *a_crtc; +struct drm_plane *plane; +struct spacemit_kms *kms; +struct drm_device *drm; +int ret; + + ret =aperture_remove_all_conflicting_devices (spacemit_drm_drv.name); +if (ret) { +dev_err (dev,"failed to remove existing framebuffers: %d\n" , + ret); +return ret; + } + + kms =devm_drm_dev_alloc (dev, &spacemit_drm_drv, + struct spacemit_kms, drm); +if (IS_ERR (kms)) +return PTR_ERR (kms); + drm = &kms->drm; + priv->ddev = drm; + drm->dev_private = priv; + + ret =spacemit_drm_mode_config_init (drm); +if (ret) +return ret; + + a_crtc =drmm_kzalloc (drm,sizeof (*a_crtc),GFP_KERNEL ); +if (!a_crtc) { + ret = -ENOMEM ; + goto err_dc; + } + a_crtc->dev = dev; + a_crtc->first_modeset = true; + priv->a_crtc = a_crtc; + + a_crtc->clk_ctx = priv->clk_ctx; + a_crtc->aclk =DPU_AXICLK_DEFAULT ; + a_crtc->irq_online = priv->irq_online; + +/* Both K3 DPU instances are COMPOSER1 in the Saturn IRQ tables. */ + a_crtc->dev_id =COMPOSER1 ; + +/* The K3 pipeline always hands RGB888 to the DP/eDP encoder. */ + a_crtc->out_format =OUTFMT_RGB888 ; + + a_crtc->core = &dpu_saturn_ops; + +timer_setup (&a_crtc->cfg_rdy_timer, spacemit_cfg_rdy_timer_handler,0 ); + + plane =spacemit_plane_init (drm, a_crtc); +if (IS_ERR (plane)) { + ret =PTR_ERR (plane); + goto err_dc; + } + + ports =of_get_child_by_name (np,"ports" ); +if (!ports) { +dev_err (dev,"CRTC %pOF has no ports node\n" , np); + ret = -EINVAL ; + goto err_dc; + } + + port =of_get_child_by_name (ports,"port" ); +if (!port) { +dev_err (dev,"CRTC %pOF has no port@X node\n" , np); + ret = -EINVAL ; + goto err_ports_put; + } + + ret =spacemit_crtc_bind_init (drm, &a_crtc->crtc, plane, port); +of_node_put (port); +of_node_put (ports); + port =NULL ; + ports =NULL ; +if (ret) + goto err_dc; + +/* +* component_bind_all() unbinds what it bound before returning an error. +*/ + ret =component_bind_all (dev, drm); +if (ret) { +dev_err (dev,"failed to bind all components\n" ); + goto err_dc; + } + + ret =drm_vblank_init (drm, drm->mode_config.num_crtc); +if (ret) { +dev_err (dev,"failed to initialize vblank\n" ); + goto err_unbind_all; + } + +drm_mode_config_reset (drm); +drmm_kms_helper_poll_init (drm); +drm_helper_hpd_irq_event (drm); + +enable_irq (priv->irq_online); + + ret =drm_dev_register (drm,0 ); +if (ret <0 ) + goto err_disable_irq; +drm_client_setup (drm,NULL ); + +return 0 ; + +err_disable_irq: +disable_irq (priv->irq_online); + +err_unbind_all: +component_unbind_all (dev, drm); + goto err_dc; +err_ports_put: +of_node_put (port); +of_node_put (ports); +err_dc: +/* +* .shutdown tests priv->ddev; never leave it on a half-initialised +* device. +*/ + priv->ddev =NULL ; + priv->a_crtc =NULL ; +return ret; +} + +static void spacemit_drm_master_unbind (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct drm_device *drm = priv->ddev; + +/* +* The fbdev-restore commit inside drm_dev_unregister() and the +* shutdown commit both arm the CFG_RDY handshake, which is confirmed +* from the DPU interrupt; the line must stay alive until the last +* commit has drained or every teardown commit rides the watchdog +* timeout instead. +*/ +drm_dev_unregister (drm); +drm_atomic_helper_shutdown (drm); + +disable_irq (priv->irq_online); + +component_unbind_all (dev, drm); + +/* .shutdown and a later re-bind must not touch the stale instance. */ + priv->ddev =NULL ; + priv->a_crtc =NULL ; +} + +const struct component_master_ops spacemit_drm_master_ops = { + .bind = spacemit_drm_master_bind, + .unbind = spacemit_drm_master_unbind, +}; + +static int spacemit_dpu_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +const struct spacemit_hw_device *hwdev_template; +struct spacemit_drm_private *priv; +struct device_node *np = dev->of_node; +int ret; + +if (!np) { +dev_err (dev,"no OF node for the DPU\n" ); +return -ENODEV ; + } + + ret =dma_coerce_mask_and_coherent (dev,DMA_BIT_MASK (64 )); +if (ret) +return dev_err_probe (dev, ret,"failed to set DMA mask\n" ); + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + priv->dev = dev; +dev_set_drvdata (dev, priv); + +/* The match data is shared const; the MMIO mapping is per-instance. */ + hwdev_template =device_get_match_data (dev); +if (!hwdev_template) +return -ENODEV ; + priv->hwdev =devm_kmemdup (dev, hwdev_template, +sizeof (*hwdev_template),GFP_KERNEL ); +if (!priv->hwdev) +return -ENOMEM ; + + priv->cmdlist_groups =devm_kcalloc (dev, + priv->hwdev->rdma_nums + priv->hwdev->crtc_nums, +sizeof (*priv->cmdlist_groups),GFP_KERNEL ); +if (!priv->cmdlist_groups) +return -ENOMEM ; + + priv->hwdev->base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (priv->hwdev->base)) +return PTR_ERR (priv->hwdev->base); + + priv->hwdev->regmap =devm_regmap_init_mmio (dev, priv->hwdev->base, + &spacemit_dpu_regmap_config); +if (IS_ERR (priv->hwdev->regmap)) +return dev_err_probe (dev,PTR_ERR (priv->hwdev->regmap), +"failed to init DPU regmap\n" ); + + ret =spacemit_dpu_hw_resources_init (priv, pdev); +if (ret) +return ret; + +return spacemit_drm_of_component_probe (dev); +} + +static void spacemit_dpu_remove (struct platform_device *pdev) +{ +component_master_del (&pdev->dev, &spacemit_drm_master_ops); +} + +static void spacemit_dpu_shutdown (struct platform_device *pdev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (&pdev->dev); +struct drm_device *drm = priv->ddev; + +if (!drm) { +dev_warn (&pdev->dev, +"drm device is not available, no shutdown\n" ); +return ; + } + +drm_atomic_helper_shutdown (drm); +} + +static int dpu_pm_suspend (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct spacemit_crtc *a_crtc = priv->a_crtc; +int ret; + +/* +* Assert before gating: a reset asserted into an already-gated block +* has no clock edges to propagate on and leaves the register file +* untouched. +*/ + ret =reset_control_bulk_assert (ARRAY_SIZE (priv->pipe_resets), + priv->pipe_resets); +if (ret) +dev_warn (dev,"failed to assert resets: %d\n" , ret); +usleep_range (10000 ,20000 ); + +if (a_crtc->core && a_crtc->core->disable_clk) + a_crtc->core->disable_clk (a_crtc); + +return 0 ; +} + +static int dpu_pm_resume (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct spacemit_crtc *a_crtc = priv->a_crtc; +int ret; + + ret =reset_control_bulk_deassert (ARRAY_SIZE (priv->pipe_resets), + priv->pipe_resets); +if (ret) +dev_warn (dev,"failed to deassert resets: %d\n" , ret); + +if (a_crtc->core && a_crtc->core->enable_clk) + a_crtc->core->enable_clk (a_crtc); + +return 0 ; +} + +static const struct of_device_id dpu_match_table[] = { + { + .compatible ="spacemit,k3-saturn-dpu" , + .data = &k3_saturn_dpu, + }, + {}, +}; +MODULE_DEVICE_TABLE (of, dpu_match_table); + +static struct platform_driver spacemit_dpu_driver = { + .probe = spacemit_dpu_probe, + .remove = spacemit_dpu_remove, + .shutdown = spacemit_dpu_shutdown, + .driver = { + .name ="spacemit-dpu-drv" , + .of_match_table = dpu_match_table, + .suppress_bind_attrs = true, + }, +}; +module_platform_driver (spacemit_dpu_driver); + +MODULE_DESCRIPTION ("SpacemiT DRM KMS master driver" ); +MODULE_LICENSE ("GPL" );
drivers/gpu/drm/spacemit/spacemit_planes.c new file +377 -0
377 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 10/17] drm/spacemit: add Saturn DPU KMS pipeline
Thank you for your contribution! Sashiko AI review found 9 potential issue(s) to consider: - [Critical] Early return in atomic_disable due to drm_dev_enter skips hardware teardown and timer…
Thank you for your contribution! Sashiko AI review found 9 potential issue(s) to consider:
- [Critical] Early return in atomic_disable due to drm_dev_enter skips hardware teardown and timer cancellation.
- [Critical] Permanent physical memory leak due to unbalanced page pinning in spacemit_dmmu_map.
- [High] Sleeping functions called from atomic context in CRTC atomic_enable and atomic_disable callbacks.
- [High] Plane atomic_update callback invokes sleeping GEM helpers.
- [High] Interrupt storm due to unhandled IRQ during device bind.
- [High] Race condition between IRQ synchronization and clock gating.
- [High] Memory leak of DRM device on component unbind.
- [High] Unconditional interrupt enable via spin_unlock_irq in atomic context.
- [High] Ignored return value of get_cl_rdma_buf leads to Use-After-Free of command list registers. --
--- Patch [10]: [PATCH v2 10/17] drm/spacemit: add Saturn DPU KMS pipeline --- commit f9572a94b08eefdd84a13496054fbc00b42837b7
Author: Cody Kang <[email protected]>
Subject: drm/spacemit: add Saturn DPU KMS pipeline
Add the atomic KMS implementation on top of the hardware backend: one CRTC and one primary plane per DPU instance. atomic_check validates the plane rectangle 1:1 against the mode and sizes the per-channel FBC line buffer; atomic commit builds the cmdlist batches, maps the framebuffer through the DMMU and arms the cfg-ready handshake, with vblank events driven from the DPU interrupt.
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +0
-0
[ ... ]
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +0
-0@@ -96,25 +96,25 @@ static void spacemit_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_commit *old_state) {
[ ... ]
Quoted 12 lines
if (unlikely(a_crtc->first_modeset)) {
ret = reset_control_bulk_assert(ARRAY_SIZE(priv->pipe_resets),
priv->pipe_resets);
if (ret)
dev_warn(a_crtc->dev,
"failed to assert resets: %d\n", ret);
usleep_range(10000, 20000);
a_crtc->first_modeset = false;
}
if (!a_crtc->clocks_on) {
dpu_pm_resume(a_crtc->dev);Quoted 8 lines
a_crtc->clocks_on = true; /* * The DPU must settle after reset deassert or CFG_RDY races * the flush. */ usleep_range(10000, 20000); }
[Severity: High]
Could the usleep_range() calls cause system instability?
The DRM subsystem requires CRTC atomic_enable and atomic_disable callbacks to execute in atomic context, where sleeping is strictly forbidden.
Because usleep_range() sleeps, calling it directly here violates the atomic context constraints.
[ ... ]
drivers/gpu/drm/spacemit/spacemit_crtc.c static void spacemit_crtc_atomic_disable(struct drm_crtc *crtc, · line 136
Quoted 9 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +0
-0@@ -131,23 +129,20 @@ static void spacemit_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_commit *old_state) {struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc);struct drm_device *drm = a_crtc->crtc.dev;int idx;if (!drm_dev_enter (drm, &idx))return ;
[Severity: Critical]
Does checking drm_dev_enter() here inadvertently skip hardware teardown during unbind?
During driver unbind, spacemit_drm_master_unbind() calls drm_dev_unregister(), which sets the unplugged flag. It then calls drm_atomic_helper_shutdown(), which invokes spacemit_crtc_atomic_disable().
Because the device is already marked unplugged, drm_dev_enter() evaluates to false. This causes an immediate return, bypassing the timer cancellation (which leaves a pending timer pointing to freed memory) and the VBLANK event signaling (which can stall the teardown commit).
[ ... ]
drivers/gpu/drm/spacemit/spacemit_crtc.c static void spacemit_crtc_atomic_disable(struct drm_crtc *crtc, · line 143
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +0
-0/* * MMIO on a clock-gated DPU stalls the bus, so an in-flight handler * must finish its status reads before dpu_pm_suspend() gates the * clocks. */ if (a_crtc->irq_online >0 )synchronize_irq (a_crtc->irq_online);
[Severity: High]
Is it safe to call synchronize_irq() in atomic context?
This function can sleep, which violates the requirement that atomic_disable callbacks execute in atomic context without sleeping.
Quoted 8 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +0
-0/* * Nothing else cancels the watchdog; it would fire against freed state. */ timer_delete_sync (&a_crtc->cfg_rdy_timer);/* Close the ISR's MMIO gate before the clocks actually stop. */ a_crtc->clocks_on = false; dpu_pm_suspend(a_crtc->dev);
[Severity: High]
Might this sequence allow a new interrupt to slip in?
If synchronize_irq() completes, it only guarantees that in-flight handlers have finished. Because a_crtc->clocks_on is still true when it returns, a newly triggered interrupt could immediately enter the ISR.
Meanwhile, this thread continues, setting a_crtc->clocks_on to false and calling dpu_pm_suspend() to gate the clocks. If the racing ISR attempts MMIO reads on the clock-gated hardware, it could stall the system bus.
Additionally, does dpu_pm_suspend() sleep in this atomic context? It invokes usleep_range() internally, which would violate the atomic_disable constraints.
Quoted 6 lines
spin_lock_irq(&drm->event_lock);
if (crtc->state->event) {
drm_crtc_send_vblank_event(crtc, crtc->state->event);
crtc->state->event = NULL;
}
spin_unlock_irq(&drm->event_lock);[Severity: High]
Will this unconditionally re-enable local interrupts?
Because spacemit_crtc_atomic_disable() executes in atomic context, the caller might have already disabled interrupts. Calling spin_unlock_irq() re-enables them unconditionally.
Would it be better to use spin_unlock_irqrestore() to preserve the original CPU interrupt state?
[ ... ]
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +0
-0@@ -467,20 +465,19 @@ static int spacemit_drm_master_bind(struct device *dev) {
[ ... ]
Quoted 4 lines
kms = devm_drm_dev_alloc(dev, &spacemit_drm_drv, struct spacemit_kms, drm); if (IS_ERR(kms)) return PTR_ERR(kms);
[Severity: High]
Will this leak the DRM device structure on component unbind?
The KMS structure is allocated with devm_drm_dev_alloc() inside spacemit_drm_master_bind(). The devm_* lifecycle is tied to the platform device's probe and remove cycle, not the component bind and unbind cycle.
When spacemit_drm_master_unbind() is called, the DRM device is unregistered but never freed because the platform device is not removed. A subsequent re-bind would allocate a new instance, permanently leaking the old one along with all drmm_* managed allocations.
[ ... ]
Quoted 3 lines
enable_irq(priv->irq_online); ret = drm_dev_register(drm, 0);
[Severity: High]
Could enabling the IRQ here lead to an interrupt storm?
At this point during bind, the hardware might not be fully reset and a_crtc->clocks_on is still false. If a bootloader left the display pipeline active, the hardware will continuously assert the interrupt.
When the ISR fires, it sees !a_crtc->clocks_on and immediately returns IRQ_NONE without clearing the hardware interrupt status. This causes the interrupt to fire repeatedly, potentially hanging the system.
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +0
-0
[ ... ]
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +0
-0@@ -170,25 +170,24 @@ static void spacemit_plane_atomic_update(struct drm_plane *plane, struct drm_atomic_commit *state) {
[ ... ]
Quoted 1 line
hwdev->get_cl_rdma_buf(a_crtc);
[Severity: High]
What happens if hwdev->get_cl_rdma_buf() fails here?
If the return value is ignored and it fails to allocate, a_crtc->cl_rdma could remain uninitialized or retain a dangling pointer from a previous iteration.
Later, free_cmdlist_regs(a_crtc->cl_rdma) frees the pointer but does not set it to NULL. If a subsequent plane update fails its allocation, it would double-free the old pointer.
Quoted 9 lines
hwdev->plane_update_hw_channel(plane);
/* Solid-fill layers have no RDMA and no page table */
if (rdma_id < hwdev->rdma_nums && spacemit_pstate->mmu_tbl.va) {
u8 tbu_id = rdma_id * 2;
ret = spacemit_dmmu_map(plane->state->fb,
&spacemit_pstate->mmu_tbl, tbu_id,
a_crtc->cl_rdma, plane);[Severity: High]
Does this path invoke sleeping functions from atomic context?
The spacemit_plane_atomic_update() callback executes in atomic context. However, it calls spacemit_dmmu_map(), which subsequently calls drm_gem_shmem_get_pages_sgt().
The drm_gem_shmem_get_pages_sgt() helper acquires the pages_lock mutex and can block for disk I/O or GFP_KERNEL allocations, which is unsafe in atomic context. Should this mapping be deferred to the prepare_fb phase?
[Severity: Critical]
Is there a missing unpin for the pages acquired inside the mapping function?
Calling drm_gem_shmem_get_pages_sgt() retrieves the scatter-gather table and implicitly pins the backing physical pages by incrementing the object's pages_use_count.
Since this occurs on every plane atomic update, and there appears to be no matching drm_gem_shmem_put_pages() call during cleanup, the pages_use_count will continually inflate. This prevents the GEM SHMEM core from releasing the physical pages when the framebuffer is destroyed, leading to a permanent memory leak.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Thomas Zimmermann
maintainerRe: [PATCH v2 10/17] drm/spacemit: add Saturn DPU KMS pipeline
In reply to Cody KangHi,
please find a review below. I've only mentioned most issues once, they are usually throughout the code. Please fix all instances then.
Am 09.08.26 um 15:14 schrieb Cody Kang via B4 Relay:
Quoted 98 lines
From: Cody Kang <[email protected]>
Add the atomic KMS implementation on top of the hardware backend: one CRTC and one primary plane per DPU instance.
atomic_checkvalidates the plane rectangle 1:1 against the mode and sizes the per-channel FBC line buffer; atomic commit builds the cmdlist batches, maps the framebuffer through the DMMU and arms the cfg-ready handshake, with vblank events driven from the DPU interrupt.Signed-off-by Cody Kang <[email protected]>---
v2:
- put all five DPU reset lines behind one reset_control_bulk_* pair (Philipp Zabel, Guodong Xu)
- keep the online IRQ alive acrossdrm_dev_unregister()anddrm_atomic_helper_shutdown()in unbind (Sashiko)
- free the per-state DMA buffers in the plane .reset path instead of bypassing the custom state destructor (Sashiko)
- release the duplicated state's references on the rdmas allocation failure path in crtcduplicate_state(Sashiko)
- setclocks_ononly afterdpu_pm_resume()has enabled the clocks (Sashiko)--- drivers/gpu/drm/spacemit/spacemit_crtc.c | 786 +++++++++++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_planes.c | 377 ++++++++++++++ 2 files changed, 1163 insertions(+)drivers/gpu/drm/spacemit/spacemit_crtc.c new file +64
-0@@ -0,0 +1,786 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#include <drm/drm_print.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_managed.h> +#include <drm/clients/drm_client_setup.h> +#include <linux/aperture.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/component.h> +#include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/pm_qos.h> +#include <linux/property.h> +#include <linux/mutex.h> +#include <linux/string.h> +#include <linux/trace_events.h> +#include <linux/of_platform.h> +#include <linux/regmap.h> +#include "spacemit_dpu_ids.h" +#include <linux/reset.h> +#include "spacemit_cmdlist.h" +#include "spacemit_dmmu.h" +#include "spacemit_drm.h" +#include "spacemit_crtc.h" +#include "dpu/dpu_saturn.h" +#include "dpu/dpu_trace.h" + +static int spacemit_crtc_init (struct spacemit_crtc *a_crtc); +static int spacemit_crtc_uninit (struct spacemit_crtc *a_crtc); +static int dpu_pm_suspend (struct device *dev); +static int dpu_pm_resume (struct device *dev); + +static void saturn_count_rdma_use (struct drm_crtc_state *crtc_state) +{ +struct drm_plane *plane; +struct spacemit_crtc_state *spacemit_state = +to_spacemit_crtc_state (crtc_state); +struct spacemit_crtc_rdma *rdmas = spacemit_state->rdmas; +u32 rdma_id =0 ; +const struct drm_plane_state *pstate; + +drm_atomic_crtc_state_for_each_plane_state (plane, pstate, crtc_state) { + rdma_id =to_spacemit_plane_state (pstate)->rdma_id; +if (rdma_id !=RDMA_INVALID_ID ) + rdmas[rdma_id].use_cnt++; + } +} + +static int spacemit_crtc_atomic_check_fbmem (struct drm_crtc *crtc, +struct drm_crtc_state *crtc_state) +{ +struct spacemit_crtc_rdma *rdmas = +to_spacemit_crtc_state (crtc_state)->rdmas;
drivers/gpu/drm/spacemit/spacemit_crtc.c line 74
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +10
-0+struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +const struct drm_plane_state *pstate; +struct drm_plane *plane; + +drm_atomic_crtc_state_for_each_plane_state (plane, pstate, crtc_state) { +u32 rdma_id =to_spacemit_plane_state (pstate)->rdma_id; +u32 layer_fbcmem_size = +to_spacemit_plane_state (pstate)->fbcmem_size;
If you need to check plane state, please do this in the plane's atomic_check. For atomic commits that only change plane state, the CRTC's atomic_check might not run, I think.
It looks like this code allocates memory. This is is something that should be done globally.
Quoted 9 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +9
-0+ +if (rdma_id !=RDMA_INVALID_ID ) + rdmas[rdma_id].fbcmem.size =max (layer_fbcmem_size, + rdmas[rdma_id].fbcmem.size); + } + +return a_crtc->core->adjust_rdma_fbcmem (hwdev, rdmas); +} +
drivers/gpu/drm/spacemit/spacemit_crtc.c line 93
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +10
-0+static void spacemit_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_commit *old_state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct spacemit_drm_private *priv = crtc->dev->dev_private; +int idx; +int ret; + +if (!drm_dev_enter (crtc->dev, &idx)) +return ;
drm_dev_enter() and drm_dev_exit() protect hardware access. Given hat you have a tracepoint below, you certainly don't want to return here. It's is better to write code like this
atomic_enable() {
if (drm_dev_enter()) {
// do HW access
drm_dev_exit()
}
}
although not many drivers do this.
drivers/gpu/drm/spacemit/spacemit_crtc.c line 95
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +2
-0+ +trace_spacemit_crtc_atomic_enable (a_crtc->dev_id);
Why is your modesetting code is filled with tracepoints? Most other drivers don't need them. There is debugging infrastructure available in DRM.
Quoted 5 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +5
-0+ +/* +* U-Boot leaves its boot-logo pipeline running. Hard-stop it with the +* resets alone; the clocks are not ours to gate until we have enabled +* them.
drivers/gpu/drm/spacemit/spacemit_crtc.c line 110
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +10
-0+*/ +if (unlikely (a_crtc->first_modeset)) { + ret =reset_control_bulk_assert (ARRAY_SIZE (priv->pipe_resets), + priv->pipe_resets); +if (ret) +dev_warn (a_crtc->dev, +"failed to assert resets: %d\n" , ret); +usleep_range (10000 ,20000 ); + a_crtc->first_modeset = false; + }
Just no. This code belongs into driver or platform init. It is definitely not for mode setting.
drivers/gpu/drm/spacemit/spacemit_crtc.c line 123
Quoted 13 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +13
-0+ +if (!a_crtc->clocks_on) { +dpu_pm_resume (a_crtc->dev); + a_crtc->clocks_on = true; + +/* +* The DPU must settle after reset deassert or CFG_RDY races +* the flush. +*/ +usleep_range (10000 ,20000 ); + } + +drm_crtc_vblank_on (&a_crtc->crtc);
I'd say you want to enable vblanking after programming the display mode. (?)
drivers/gpu/drm/spacemit/spacemit_crtc.c line 125
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +2
-0+ +spacemit_crtc_init (a_crtc);
The code is full of these tiny helpers. Please inline them. And please also avoid the callbacks that these tiny helpers invoke. The DRM interfaces are your abstraction interface. Please don't introduce another one.
Quoted 17 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +17
-0+ +drm_dev_exit (idx); +} + +static void spacemit_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_commit *old_state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct drm_device *drm = a_crtc->crtc.dev; +int idx; + +if (!drm_dev_enter (drm, &idx)) +return ; + +trace_spacemit_crtc_atomic_disable (a_crtc->dev_id); + +spacemit_crtc_uninit (a_crtc);
drivers/gpu/drm/spacemit/spacemit_crtc.c line 152
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +10
-0+ +drm_crtc_vblank_off (&a_crtc->crtc); + +/* +* MMIO on a clock-gated DPU stalls the bus, so an in-flight handler +* must finish its status reads before dpu_pm_suspend() gates the +* clocks. +*/ +if (a_crtc->irq_online >0 ) +synchronize_irq (a_crtc->irq_online);
This irq is unrelated to vblanking, I presume?
drivers/gpu/drm/spacemit/spacemit_crtc.c line 161
Quoted 9 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +9
-0+ +/* +* Nothing else cancels the watchdog; it would fire against freed state. +*/ +timer_delete_sync (&a_crtc->cfg_rdy_timer); + +/* Close the ISR's MMIO gate before the clocks actually stop. */ + a_crtc->clocks_on = false; +dpu_pm_suspend (a_crtc->dev);
This whole DPU PM stuff doesn't seem to belong here. There's are device-PM ops for controlling power management. It might happen that compositors disable the CRTC for simple mode setting. This should not suspend the whole device.
drivers/gpu/drm/spacemit/spacemit_crtc.c line 168
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +7
-0+ +spin_lock_irq (&drm->event_lock); +if (crtc->state->event) { +drm_crtc_send_vblank_event (crtc, crtc->state->event); + crtc->state->event =NULL ; + } +spin_unlock_irq (&drm->event_lock);
You need set up the vblank machinery to send the event on the next vblank irq. See [1] for a simple example.
[1] https://elixir.bootlin.com/linux/v7.2.5/source/drivers/gpu/drm/drm_vblank_helper.c#L51
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +4
-0+ +drm_dev_exit (idx); +} +
drivers/gpu/drm/spacemit/spacemit_crtc.c line 182
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +10
-0+static int spacemit_crtc_atomic_check (struct drm_crtc *crtc, +struct drm_atomic_commit *atomic_state) +{ +struct drm_crtc_state *state = +drm_atomic_get_new_crtc_state (atomic_state, crtc); +struct spacemit_crtc_state *cstate =to_spacemit_crtc_state (state); +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +int ret =0 ; + +trace_spacemit_crtc_atomic_check (a_crtc->dev_id);
Please don't add your own tracepoints.
drivers/gpu/drm/spacemit/spacemit_crtc.c line 187
Quoted 5 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +5
-0+ + ret =spacemit_crtc_atomic_check_fbmem (crtc, state); +if (ret) { +drm_dbg_kms (crtc->dev, +"failed to satisfy fbcmem size for all rdmas\n" );
Drivers should only use drm_dbg(). drm_dbg_kms() et al are for DRM core and helpers.
Quoted 37 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +37
-0+return ret; + } + +saturn_count_rdma_use (state); + + ret =spacemit_cmdlist_alloc (a_crtc->dev, &cstate->cl); +if (ret) +return ret; + +return 0 ; +} + +static void spacemit_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_commit *state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_atomic_begin (a_crtc->dev_id); +} + +static void spacemit_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_commit *state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); +struct drm_crtc_state *old_state =drm_atomic_get_old_crtc_state (state, + crtc); +int idx; + +if (!drm_dev_enter (crtc->dev, &idx)) +return ; + +trace_spacemit_crtc_atomic_flush (a_crtc->dev_id); + +spacemit_crtc_run (crtc, old_state); + +drm_dev_exit (idx); +}
drivers/gpu/drm/spacemit/spacemit_crtc.c line 234
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +10
-0+ +static struct drm_crtc_state * +spacemit_crtc_duplicate_state (struct drm_crtc *crtc) +{ +struct spacemit_crtc_state *state; +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +u8 n_rdma; + +if (WARN_ON (!crtc->state))
There are helpers like drm_WARN_ON() et al. Please prefer them over WARN_ON() and other non-DRM counterparts.
Quoted 343 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +343
-0+return NULL ; + + state =kzalloc_obj (*state); +if (!state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &state->base); + + n_rdma = hwdev->rdma_nums; + state->rdmas =kzalloc_objs (*state->rdmas, n_rdma); +if (!state->rdmas) { +__drm_atomic_helper_crtc_destroy_state (&state->base); +kfree (state); +return NULL ; + } + + state->cl.type =CMDLIST_CRTC ; + +return &state->base; +} + +static void spacemit_crtc_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct spacemit_crtc_state *spacemit_state =NULL ; +struct spacemit_crtc *a_crtc =NULL ; + +if (state) { + spacemit_state =to_spacemit_crtc_state (state); +__drm_atomic_helper_crtc_destroy_state (state); + a_crtc =to_spacemit_crtc (crtc); +if (spacemit_state->cl.va) +dma_free_coherent (a_crtc->dev, + spacemit_state->cl.size, + spacemit_state->cl.va, + spacemit_state->cl.pa); +kfree (spacemit_state->rdmas); +kfree (spacemit_state); + } +} + +static void spacemit_crtc_reset (struct drm_crtc *crtc) +{ +struct spacemit_drm_private *priv = crtc->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct spacemit_crtc_state *state; + +if (crtc->state) +spacemit_crtc_destroy_state (crtc, crtc->state); + + state =kzalloc_obj (*state); +if (!state) { +__drm_atomic_helper_crtc_reset (crtc,NULL ); +return ; + } + + state->rdmas =kzalloc_objs (*state->rdmas, hwdev->rdma_nums); +if (!state->rdmas) { +kfree (state); +__drm_atomic_helper_crtc_reset (crtc,NULL ); +return ; + } + +__drm_atomic_helper_crtc_reset (crtc, &state->base); +} + +static int spacemit_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_enable_vblank (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->enable_vsync) + a_crtc->core->enable_vsync (a_crtc); + +return 0 ; +} + +static void spacemit_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_disable_vblank (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->disable_vsync) + a_crtc->core->disable_vsync (a_crtc); +} + +static const struct drm_crtc_helper_funcs spacemit_crtc_helper_funcs = { + .atomic_check = spacemit_crtc_atomic_check, + .atomic_begin = spacemit_crtc_atomic_begin, + .atomic_flush = spacemit_crtc_atomic_flush, + .atomic_enable = spacemit_crtc_atomic_enable, + .atomic_disable = spacemit_crtc_atomic_disable, +}; + +static const struct drm_crtc_funcs spacemit_crtc_funcs = { + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .reset = spacemit_crtc_reset, + .atomic_duplicate_state = spacemit_crtc_duplicate_state, + .atomic_destroy_state = spacemit_crtc_destroy_state, + .enable_vblank = spacemit_crtc_enable_vblank, + .disable_vblank = spacemit_crtc_disable_vblank, +}; + +static void spacemit_crtc_put_port (struct drm_device *drm,void *port) +{ +of_node_put (port); +} + +static int spacemit_crtc_bind_init (struct drm_device *drm,struct drm_crtc *crtc, +struct drm_plane *primary,struct device_node *port) +{ +int err; + +/* +* drm_of_find_possible_crtcs() walks crtc->port for the life of the +* drm_device. +*/ + crtc->port =of_node_get (port); + err =drmm_add_action_or_reset (drm, spacemit_crtc_put_port, port); +if (err) +return err; + + err =drm_crtc_init_with_planes (drm, crtc, primary,NULL , + &spacemit_crtc_funcs,NULL ); +if (err) { +drm_err (drm,"failed to init crtc\n" ); +return err; + } + +drm_mode_crtc_set_gamma_size (crtc,256 ); + +drm_crtc_helper_add (crtc, &spacemit_crtc_helper_funcs); + +return 0 ; +} + +int spacemit_crtc_run (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc); + +trace_spacemit_crtc_run (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->run) + a_crtc->core->run (crtc, old_state); + +return 0 ; +} + +static int spacemit_crtc_init (struct spacemit_crtc *a_crtc) +{ +trace_spacemit_crtc_init (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->init) + a_crtc->core->init (a_crtc); + + a_crtc->is_1st_f = true; + +return 0 ; +} + +static int spacemit_crtc_uninit (struct spacemit_crtc *a_crtc) +{ +trace_spacemit_crtc_uninit (a_crtc->dev_id); + +if (a_crtc->core && a_crtc->core->uninit) + a_crtc->core->uninit (a_crtc); + +return 0 ; +} + +static irqreturn_t spacemit_dpu_isr (int irq,void *data) +{ +struct spacemit_drm_private *priv = data; +struct spacemit_crtc *a_crtc = priv->a_crtc; +int idx; + +if (!a_crtc) +return IRQ_NONE ; + +if (!drm_dev_enter (a_crtc->crtc.dev, &idx)) +return IRQ_NONE ; + +/* Reading a clock-gated DPU's status registers stalls the bus. */ +if (unlikely (!a_crtc->clocks_on)) { +drm_dev_exit (idx); +return IRQ_NONE ; + } + +if (a_crtc->core && a_crtc->core->online_isr) + a_crtc->core->online_isr (a_crtc); + +drm_dev_exit (idx); + +return IRQ_HANDLED ; +} + +/* +* Acquire at probe, not at bind: the aggregate can rebind without this device +* detaching, and the exclusive resets would not be handed out a second time. +*/ +static int spacemit_dpu_hw_resources_init (struct spacemit_drm_private *priv, +struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +int n_rstc; +int ret; + + ret =dpu_parse_clocks (dev, &priv->clk_ctx); +if (ret) +return ret; + + priv->pipe_resets[0 ].id ="lcd" ; + priv->pipe_resets[1 ].id ="esc" ; + priv->pipe_resets[2 ].id ="mclk" ; + priv->pipe_resets[3 ].id ="aclk" ; + priv->pipe_resets[4 ].id ="dsc" ; + n_rstc =ARRAY_SIZE (priv->pipe_resets); + ret =devm_reset_control_bulk_get_optional_exclusive (dev, n_rstc, + priv->pipe_resets); +if (ret) +return dev_err_probe (dev, ret,"failed to get resets\n" ); + + priv->irq_online =platform_get_irq_byname (pdev,"online" ); +if (priv->irq_online <0 ) +return priv->irq_online; + +/* +* Keep the line disabled until bind: the handler needs bind-created +* state, and a bootloader-left display can raise an interrupt during +* probe. +*/ + ret =devm_request_irq (dev, priv->irq_online, spacemit_dpu_isr, +IRQF_NO_AUTOEN ,"DPU_ONLINE" , priv); +if (ret) +return dev_err_probe (dev, ret, +"failed to request online IRQ\n" ); + +return 0 ; +} + +static const struct regmap_config spacemit_dpu_regmap_config = { + .name ="dpu" , + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , + .max_register =0x53ffc ,/* 0x54000-byte DPU MMIO from binding */ +}; + +/* Bind-scope wrapper so devm_drm_dev_alloc has a struct to embed into. */ +struct spacemit_kms { +struct drm_device drm; +}; + +static int spacemit_drm_master_bind (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct device_node *np = dev->of_node; +struct device_node *ports =NULL , *port =NULL ; +struct spacemit_crtc *a_crtc; +struct drm_plane *plane; +struct spacemit_kms *kms; +struct drm_device *drm; +int ret; + + ret =aperture_remove_all_conflicting_devices (spacemit_drm_drv.name); +if (ret) { +dev_err (dev,"failed to remove existing framebuffers: %d\n" , + ret); +return ret; + } + + kms =devm_drm_dev_alloc (dev, &spacemit_drm_drv, + struct spacemit_kms, drm); +if (IS_ERR (kms)) +return PTR_ERR (kms); + drm = &kms->drm; + priv->ddev = drm; + drm->dev_private = priv; + + ret =spacemit_drm_mode_config_init (drm); +if (ret) +return ret; + + a_crtc =drmm_kzalloc (drm,sizeof (*a_crtc),GFP_KERNEL ); +if (!a_crtc) { + ret = -ENOMEM ; + goto err_dc; + } + a_crtc->dev = dev; + a_crtc->first_modeset = true; + priv->a_crtc = a_crtc; + + a_crtc->clk_ctx = priv->clk_ctx; + a_crtc->aclk =DPU_AXICLK_DEFAULT ; + a_crtc->irq_online = priv->irq_online; + +/* Both K3 DPU instances are COMPOSER1 in the Saturn IRQ tables. */ + a_crtc->dev_id =COMPOSER1 ; + +/* The K3 pipeline always hands RGB888 to the DP/eDP encoder. */ + a_crtc->out_format =OUTFMT_RGB888 ; + + a_crtc->core = &dpu_saturn_ops; + +timer_setup (&a_crtc->cfg_rdy_timer, spacemit_cfg_rdy_timer_handler,0 ); + + plane =spacemit_plane_init (drm, a_crtc); +if (IS_ERR (plane)) { + ret =PTR_ERR (plane); + goto err_dc; + } + + ports =of_get_child_by_name (np,"ports" ); +if (!ports) { +dev_err (dev,"CRTC %pOF has no ports node\n" , np); + ret = -EINVAL ; + goto err_dc; + } + + port =of_get_child_by_name (ports,"port" ); +if (!port) { +dev_err (dev,"CRTC %pOF has no port@X node\n" , np); + ret = -EINVAL ; + goto err_ports_put; + } + + ret =spacemit_crtc_bind_init (drm, &a_crtc->crtc, plane, port); +of_node_put (port); +of_node_put (ports); + port =NULL ; + ports =NULL ; +if (ret) + goto err_dc; + +/* +* component_bind_all() unbinds what it bound before returning an error. +*/ + ret =component_bind_all (dev, drm);
drivers/gpu/drm/spacemit/spacemit_crtc.c line 587
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +10
-0+if (ret) { +dev_err (dev,"failed to bind all components\n" ); + goto err_dc; + } + + ret =drm_vblank_init (drm, drm->mode_config.num_crtc); +if (ret) { +dev_err (dev,"failed to initialize vblank\n" ); + goto err_unbind_all; + }
Better do this after running drm_mode_config_reset().
Quoted 288 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +199
-0+ +drm_mode_config_reset (drm); +drmm_kms_helper_poll_init (drm); +drm_helper_hpd_irq_event (drm); + +enable_irq (priv->irq_online); + + ret =drm_dev_register (drm,0 ); +if (ret <0 ) + goto err_disable_irq; +drm_client_setup (drm,NULL ); + +return 0 ; + +err_disable_irq: +disable_irq (priv->irq_online); + +err_unbind_all: +component_unbind_all (dev, drm); + goto err_dc; +err_ports_put: +of_node_put (port); +of_node_put (ports); +err_dc: +/* +* .shutdown tests priv->ddev; never leave it on a half-initialised +* device. +*/ + priv->ddev =NULL ; + priv->a_crtc =NULL ; +return ret; +} + +static void spacemit_drm_master_unbind (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct drm_device *drm = priv->ddev; + +/* +* The fbdev-restore commit inside drm_dev_unregister() and the +* shutdown commit both arm the CFG_RDY handshake, which is confirmed +* from the DPU interrupt; the line must stay alive until the last +* commit has drained or every teardown commit rides the watchdog +* timeout instead. +*/ +drm_dev_unregister (drm); +drm_atomic_helper_shutdown (drm); + +disable_irq (priv->irq_online); + +component_unbind_all (dev, drm); + +/* .shutdown and a later re-bind must not touch the stale instance. */ + priv->ddev =NULL ; + priv->a_crtc =NULL ; +} + +const struct component_master_ops spacemit_drm_master_ops = { + .bind = spacemit_drm_master_bind, + .unbind = spacemit_drm_master_unbind, +}; + +static int spacemit_dpu_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +const struct spacemit_hw_device *hwdev_template; +struct spacemit_drm_private *priv; +struct device_node *np = dev->of_node; +int ret; + +if (!np) { +dev_err (dev,"no OF node for the DPU\n" ); +return -ENODEV ; + } + + ret =dma_coerce_mask_and_coherent (dev,DMA_BIT_MASK (64 )); +if (ret) +return dev_err_probe (dev, ret,"failed to set DMA mask\n" ); + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + priv->dev = dev; +dev_set_drvdata (dev, priv); + +/* The match data is shared const; the MMIO mapping is per-instance. */ + hwdev_template =device_get_match_data (dev); +if (!hwdev_template) +return -ENODEV ; + priv->hwdev =devm_kmemdup (dev, hwdev_template, +sizeof (*hwdev_template),GFP_KERNEL ); +if (!priv->hwdev) +return -ENOMEM ; + + priv->cmdlist_groups =devm_kcalloc (dev, + priv->hwdev->rdma_nums + priv->hwdev->crtc_nums, +sizeof (*priv->cmdlist_groups),GFP_KERNEL ); +if (!priv->cmdlist_groups) +return -ENOMEM ; + + priv->hwdev->base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (priv->hwdev->base)) +return PTR_ERR (priv->hwdev->base); + + priv->hwdev->regmap =devm_regmap_init_mmio (dev, priv->hwdev->base, + &spacemit_dpu_regmap_config); +if (IS_ERR (priv->hwdev->regmap)) +return dev_err_probe (dev,PTR_ERR (priv->hwdev->regmap), +"failed to init DPU regmap\n" ); + + ret =spacemit_dpu_hw_resources_init (priv, pdev); +if (ret) +return ret; + +return spacemit_drm_of_component_probe (dev); +} + +static void spacemit_dpu_remove (struct platform_device *pdev) +{ +component_master_del (&pdev->dev, &spacemit_drm_master_ops); +} + +static void spacemit_dpu_shutdown (struct platform_device *pdev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (&pdev->dev); +struct drm_device *drm = priv->ddev; + +if (!drm) { +dev_warn (&pdev->dev, +"drm device is not available, no shutdown\n" ); +return ; + } + +drm_atomic_helper_shutdown (drm); +} + +static int dpu_pm_suspend (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct spacemit_crtc *a_crtc = priv->a_crtc; +int ret; + +/* +* Assert before gating: a reset asserted into an already-gated block +* has no clock edges to propagate on and leaves the register file +* untouched. +*/ + ret =reset_control_bulk_assert (ARRAY_SIZE (priv->pipe_resets), + priv->pipe_resets); +if (ret) +dev_warn (dev,"failed to assert resets: %d\n" , ret); +usleep_range (10000 ,20000 ); + +if (a_crtc->core && a_crtc->core->disable_clk) + a_crtc->core->disable_clk (a_crtc); + +return 0 ; +} + +static int dpu_pm_resume (struct device *dev) +{ +struct spacemit_drm_private *priv =dev_get_drvdata (dev); +struct spacemit_crtc *a_crtc = priv->a_crtc; +int ret; + + ret =reset_control_bulk_deassert (ARRAY_SIZE (priv->pipe_resets), + priv->pipe_resets); +if (ret) +dev_warn (dev,"failed to deassert resets: %d\n" , ret); + +if (a_crtc->core && a_crtc->core->enable_clk) + a_crtc->core->enable_clk (a_crtc); + +return 0 ; +} + +static const struct of_device_id dpu_match_table[] = { + { + .compatible ="spacemit,k3-saturn-dpu" , + .data = &k3_saturn_dpu, + }, + {}, +}; +MODULE_DEVICE_TABLE (of, dpu_match_table); + +static struct platform_driver spacemit_dpu_driver = { + .probe = spacemit_dpu_probe, + .remove = spacemit_dpu_remove, + .shutdown = spacemit_dpu_shutdown, + .driver = { + .name ="spacemit-dpu-drv" , + .of_match_table = dpu_match_table, + .suppress_bind_attrs = true, + }, +}; +module_platform_driver (spacemit_dpu_driver); + +MODULE_DESCRIPTION ("SpacemiT DRM KMS master driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/spacemit/spacemit_planes.c new file +83
-0@@ -0,0 +1,377 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#include <drm/drm_print.h> +#include <drm/drm_atomic.h> +#include <drm/drm_blend.h> +#include <drm/drm_atomic_uapi.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_managed.h> +#include <drm/drm_plane.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_color_mgmt.h> +#include <drm/drm_gem.h> +#include <linux/component.h> +#include <linux/dma-mapping.h> +#include "spacemit_cmdlist.h" +#include "spacemit_dmmu.h" +#include "spacemit_drm.h" +#include "dpu/dpu_saturn.h" +#include "dpu/dpu_trace.h" +#include "dpu/saturn_fbcmem.h" + +/* The AFBC decoder exists but no modifier has been validated on hardware. */ +static const u64 supported_format_modifiers[] = { +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; + +struct spacemit_plane *to_spacemit_plane (struct drm_plane *plane) +{ + return container_of(plane, struct spacemit_plane, plane); +} + +static void spacemit_plane_atomic_destroy_state (struct drm_plane *plane, +struct drm_plane_state *state); + +static int spacemit_plane_atomic_check (struct drm_plane *plane, +struct drm_atomic_commit *atomic_state) +{ +struct drm_plane_state *state = +drm_atomic_get_new_plane_state (atomic_state, plane); +struct drm_framebuffer *fb = state->fb; +u32 src_w, src_h, src_x, src_y; +u32 crtc_w, crtc_h; +struct spacemit_plane_state *cur_state =to_spacemit_plane_state (state); +u32 cur_rdma_id = cur_state->rdma_id; +struct spacemit_drm_private *priv = plane->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +struct spacemit_crtc *a_crtc =NULL ; + +struct drm_crtc_state *crtc_state =NULL ; +int ret; + +if (state->crtc) + crtc_state =drm_atomic_get_new_crtc_state (atomic_state, + state->crtc); + + ret =drm_atomic_helper_check_plane_state (state, crtc_state, +DRM_PLANE_NO_SCALING , +DRM_PLANE_NO_SCALING , + true, false); +if (ret) +return ret; + +if (!state->visible) +return 0 ; + + a_crtc =to_spacemit_crtc (state->crtc); +trace_spacemit_plane_atomic_check (a_crtc->dev_id); + + src_x = state->src_x >>16 ; + src_y = state->src_y >>16 ; + src_w = state->src_w >>16 ; + src_h = state->src_h >>16 ; + crtc_w = state->crtc_w; + crtc_h = state->crtc_h; + +/* The programming paths use the raw rectangles, so refuse to clip. */
drivers/gpu/drm/spacemit/spacemit_planes.c line 93
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +10
-0+if ((state->src.x1 >>16 ) != src_x || (state->src.y1 >>16 ) != src_y || + (drm_rect_width (&state->src) >>16 ) != src_w || + (drm_rect_height (&state->src) >>16 ) != src_h || + state->dst.x1 != state->crtc_x || state->dst.y1 != state->crtc_y || +drm_rect_width (&state->dst) != crtc_w || +drm_rect_height (&state->dst) != crtc_h) { +drm_dbg_kms (plane->dev, +"clipped plane rectangles not supported\n" ); +return -EINVAL ; + }
What's the matter with this code?
Allocated buffers can be larger than the display mode. If the hardware cannot handle this, it might become a problem in some setups.
drivers/gpu/drm/spacemit/spacemit_planes.c line 100
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +7
-0+ +/* One-dimensional sources are invalid (only 0x0 = constant fill) */ +if ((src_w ==0 ) != (src_h ==0 )) { +drm_dbg_kms (plane->dev,"unsupported src_w %d src_h %d\n" , + src_w, src_h); +return -EINVAL ; + }
I'm not aware of any driver testing this. The above calculation of state->visible should have detected this case.
Quoted 20 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +20
-0+ +if (src_w ==0 && src_h ==0 ) + cur_rdma_id =RDMA_INVALID_ID ;/* constant-fill layer, no RDMA */ +else if (cur_rdma_id ==RDMA_INVALID_ID ) + cur_rdma_id = state->zpos;/* first commit: bind channel by zpos */ + cur_state->rdma_id = cur_rdma_id; + +if (cur_rdma_id !=RDMA_INVALID_ID ) { +if (cur_rdma_id >= hwdev->rdma_nums) { +drm_dbg_kms (plane->dev,"invalid rdma id %d\n" , + cur_rdma_id); +return -EINVAL ; + } + +if (a_crtc->core->cal_layer_fbcmem_size (plane, state)) { +drm_dbg_kms (plane->dev, +"plane %d: invalid fbcmem size\n" , + state->zpos); +return -EINVAL ; + }
drivers/gpu/drm/spacemit/spacemit_planes.c line 130
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +10
-0+ + cur_state->mmu_tbl.size = + ((PAGE_ALIGN (fb->obj[0 ]->size) >>PAGE_SHIFT ) + +HW_ALIGN_TTB_NUM ) *4 ; + cur_state->mmu_tbl.va = +dma_alloc_coherent (a_crtc->dev, cur_state->mmu_tbl.size, + &cur_state->mmu_tbl.pa, +GFP_KERNEL | __GFP_ZERO); +if (!cur_state->mmu_tbl.va) +return -ENOMEM ;
Resource allocation/deallocation like this should better be done in begin_fb_access/end_fb_access when you need them for the commit. User-space compositors might send in a large number of states only for atomic_check'ing. There's no point in allocating actual memory then.
Best regards
Thomas
Quoted 248 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +247
-0+ } + +/* +* The commit cannot fail, so take the DMA buffer while -ENOMEM is an +* answer. +*/ + ret =spacemit_cmdlist_alloc (a_crtc->dev, &cur_state->cl); +if (ret) +return ret; + + cur_state->format =spacemit_plane_hw_get_format_id (fb->format->format); +if (cur_state->format ==SPACEMIT_DPU_INVALID_FORMAT_ID ) { +drm_dbg_kms (plane->dev,"unsupported format %p4cc\n" , + &fb->format->format); +return -EINVAL ; + } + +return 0 ; +} + +static void spacemit_plane_atomic_update (struct drm_plane *plane, +struct drm_atomic_commit *state) +{ +int ret =0 ; +struct spacemit_crtc *a_crtc =to_spacemit_crtc (plane->state->crtc); +struct spacemit_plane_state *spacemit_pstate = +to_spacemit_plane_state (plane->state); +struct spacemit_drm_private *priv = plane->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +u32 rdma_id = spacemit_pstate->rdma_id; +struct cmdlist *cl =NULL ; +int idx; + +if (!drm_dev_enter (plane->dev, &idx)) +return ; + +trace_spacemit_plane_atomic_update (a_crtc->dev_id); + + hwdev->get_cl_rdma_buf (a_crtc); + + hwdev->plane_update_hw_channel (plane); + +/* Solid-fill layers have no RDMA and no page table */ +if (rdma_id < hwdev->rdma_nums && spacemit_pstate->mmu_tbl.va) { +u8 tbu_id = rdma_id *2 ; + + ret =spacemit_dmmu_map (plane->state->fb, + &spacemit_pstate->mmu_tbl, tbu_id, + a_crtc->cl_rdma, plane); +if (!ret) +cmdlist_regs_packing (plane_to_cl (plane), +CMDLIST_MOD_RDMA , a_crtc->cl_rdma); +else +drm_err (plane->dev,"failed to map plane: %d\n" , ret); + } + + cl = &spacemit_pstate->cl; + cl->rch_start_cmps_y =CMDLIST_SENTINEL_POISON ; + cl->cmdlist_ch_y_other =CMDLIST_SENTINEL_POISON ; +free_cmdlist_regs (a_crtc->cl_rdma); + +drm_dev_exit (idx); +} + +static void spacemit_plane_atomic_disable (struct drm_plane *plane, +struct drm_atomic_commit *state) +{ +struct drm_plane_state *old_state = +drm_atomic_get_old_plane_state (state, plane); +struct spacemit_drm_private *priv = plane->dev->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +int idx; + +if (!drm_dev_enter (plane->dev, &idx)) +return ; + + hwdev->plane_disable_hw_channel (plane, old_state); + +drm_dev_exit (idx); +} + +static void spacemit_plane_reset (struct drm_plane *plane) +{ +struct spacemit_plane_state *s; + +if (plane->state) { +spacemit_plane_atomic_destroy_state (plane, plane->state); + plane->state =NULL ; + } + + s =kzalloc (sizeof (*s),GFP_KERNEL ); +if (s) { +__drm_atomic_helper_plane_reset (plane, &s->state); + s->rdma_id =RDMA_INVALID_ID ; + } +} + +static struct drm_plane_state * +spacemit_plane_atomic_duplicate_state (struct drm_plane *plane) +{ +struct spacemit_plane_state *s; +struct spacemit_plane_state *old_state = +to_spacemit_plane_state (plane->state); +struct spacemit_crtc *a_crtc =NULL ; + +if (plane->crtc) { + a_crtc =to_spacemit_crtc (plane->crtc); +trace_spacemit_plane_atomic_duplicate_state (a_crtc->dev_id); + } + + s =kzalloc (sizeof (*s),GFP_KERNEL ); +if (!s) +return NULL ; + +__drm_atomic_helper_plane_duplicate_state (plane, &s->state); + +WARN_ON (s->state.plane != plane); + + s->cl.type =CMDLIST_PLANE ; + + s->rdma_id = old_state->rdma_id; + s->format = old_state->format; + s->fbcmem_size =0 ; + +return &s->state; +} + +static void spacemit_plane_atomic_destroy_state (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct spacemit_plane_state *spacemit_pstate = +to_spacemit_plane_state (state); +struct spacemit_crtc *a_crtc =NULL ; + +if (state->crtc) { + a_crtc =to_spacemit_crtc (state->crtc); + +if (spacemit_pstate->mmu_tbl.va) +dma_free_coherent (a_crtc->dev, + spacemit_pstate->mmu_tbl.size, + spacemit_pstate->mmu_tbl.va, + spacemit_pstate->mmu_tbl.pa); + +if (spacemit_pstate->cl.va) +dma_free_coherent (a_crtc->dev, + spacemit_pstate->cl.size, + spacemit_pstate->cl.va, + spacemit_pstate->cl.pa); +trace_spacemit_plane_atomic_destroy_state (a_crtc->dev_id); + } +__drm_atomic_helper_plane_destroy_state (state); + +kfree (to_spacemit_plane_state (state)); +} + +static void spacemit_plane_create_properties (struct spacemit_plane *p) +{ +unsigned int support_modes =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE ); + +drm_plane_create_alpha_property (&p->plane); + +drm_plane_create_blend_mode_property (&p->plane, support_modes); +} + +static const struct drm_plane_helper_funcs spacemit_plane_helper_funcs = { + .atomic_check = spacemit_plane_atomic_check, + .atomic_update = spacemit_plane_atomic_update, + .atomic_disable = spacemit_plane_atomic_disable, +}; + +static const struct drm_plane_funcs spacemit_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, + .reset = spacemit_plane_reset, + .atomic_duplicate_state = spacemit_plane_atomic_duplicate_state, + .atomic_destroy_state = spacemit_plane_atomic_destroy_state, +}; + +struct drm_plane *spacemit_plane_init (struct drm_device *drm, +struct spacemit_crtc *a_crtc) +{ +struct spacemit_plane *p =NULL ; +int err, j; +u32 *formats; +struct spacemit_drm_private *priv = drm->dev_private; +struct spacemit_hw_device *hwdev = priv->hwdev; +u8 n_formats = hwdev->n_formats; +u8 n_fbcmems = hwdev->n_fbcmems; +u8 n_rdmas = hwdev->rdma_nums; +u32 plane_crtc_mask; + +trace_spacemit_plane_init (a_crtc->dev_id); +if (n_fbcmems *2 != n_rdmas) { +drm_err (drm,"mismatched rdma/fbcmem counts: %d vs %d\n" , + n_rdmas, n_fbcmems); +return ERR_PTR (-EINVAL ); + } + +for (j =0 ; j < n_fbcmems; j++) { +if (hwdev->fbcmem_sizes[j] <FBCMEM_UNIT ) { +drm_err (drm,"invalid fbcmem_sizes[%d] = %u\n" , + j, hwdev->fbcmem_sizes[j]); +return ERR_PTR (-EINVAL ); + } + } + + formats =kcalloc (n_formats,sizeof (*formats),GFP_KERNEL ); +if (!formats) +return ERR_PTR (-ENOMEM ); + +/* +* The CRTC is created right after this, so its index is the current +* count. +*/ + plane_crtc_mask =1 << drm->mode_config.num_crtc; + +/* drmm, not devm: an open DRM fd outlives the platform unbind. */ + p =drmm_kzalloc (drm,sizeof (*p),GFP_KERNEL ); +if (!p) { +kfree (formats); +return ERR_PTR (-ENOMEM ); + } + +for (j =0 ; j < n_formats; j++) + formats[j] = hwdev->formats[j].format; + + err =drm_universal_plane_init (drm, &p->plane, plane_crtc_mask, + &spacemit_plane_funcs, formats, + n_formats, supported_format_modifiers, +DRM_PLANE_TYPE_PRIMARY ,NULL ); +kfree (formats); +if (err) { +drm_err (drm,"failed to init primary plane\n" ); +return ERR_PTR (err); + } + +drm_plane_helper_add (&p->plane, &spacemit_plane_helper_funcs); + +spacemit_plane_create_properties (p); + + p->hwdev = hwdev; + +return &p->plane; +}
Signature · 6 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)
Re: [PATCH v2 10/17] drm/spacemit: add Saturn DPU KMS pipeline
Hi Thomas,
Quoted 4 lines · Thomas Zimmermann
Hi,
please find a review below. I've only mentioned most issues once, they are usually throughout the code. Please fix all instances then.
Thanks for the review. Will fix all instances.
Quoted 1 line
Am 09.08.26 um 15:14 schrieb Cody Kang via B4 Relay:
[...]
Quoted 8 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 74
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +4
-0+drm_atomic_crtc_state_for_each_plane_state (plane, pstate, crtc_state) { +u32 rdma_id =to_spacemit_plane_state (pstate)->rdma_id; +u32 layer_fbcmem_size = +to_spacemit_plane_state (pstate)->fbcmem_size;If you need to check plane state, please do this in the plane's
atomic_check. For atomic commits that only change plane state, the CRTC'satomic_checkmight not run, I think.
Will do; the check moves into the plane's atomic_check.
Quoted 2 lines
It looks like this code allocates memory. This is is something that should be done globally.
It does not allocate memory: it partitions the on-chip line buffer. With one plane per CRTC nothing is shared between planes, so the plane's own check is enough.
[...]
Quoted 11 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (!drm_dev_enter(crtc->dev, &idx)) + return;
drm_dev_enter()anddrm_dev_exit()protect hardware access. Given hat you have a tracepoint below, you certainly don't want to return here. It's is better to write code like this
atomic_enable(){if (drm_dev_enter()) {
Quoted 7 lines
// do HW access drm_dev_exit()}
}
although not many drivers do this.
Will do.
Quoted 5 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + trace_spacemit_crtc_atomic_enable(a_crtc->dev_id);Why is your modesetting code is filled with tracepoints? Most other drivers don't need them. There is debugging infrastructure available in DRM.
Will drop them.
[...]
Quoted 11 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 110
Quoted 8 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +8
-0+ ret =reset_control_bulk_assert (ARRAY_SIZE (priv->pipe_resets), + priv->pipe_resets); +if (ret) +dev_warn (a_crtc->dev, +"failed to assert resets: %d\n" , ret); +usleep_range (10000 ,20000 ); + a_crtc->first_modeset = false; + }Just no. This code belongs into driver or platform init. It is definitely not for mode setting.
Will do; it moves to probe.
[...]
Quoted 6 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 123
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +4
-0+usleep_range (10000 ,20000 ); + } + +drm_crtc_vblank_on (&a_crtc->crtc);I'd say you want to enable vblanking after programming the display mode. (?)
Will do.
Quoted 7 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + spacemit_crtc_init(a_crtc);The code is full of these tiny helpers. Please inline them. And please also avoid the callbacks that these tiny helpers invoke. The DRM interfaces are your abstraction interface. Please don't introduce another one.
Will do.
[...]
Quoted 9 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 152
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +7
-0+/* +* MMIO on a clock-gated DPU stalls the bus, so an in-flight handler +* must finish its status reads before dpu_pm_suspend() gates the +* clocks. +*/ +if (a_crtc->irq_online >0 ) +synchronize_irq (a_crtc->irq_online);This irq is unrelated to vblanking, I presume?
It is the vblank interrupt as well: the one line carries the DPU's vsync, config-ready and underrun status. The synchronize_irq() is not about vblank, though. A register read on a clock-gated DPU stalls the bus, so a handler that is already running has to finish before the clocks stop. With the move to runtime PM (next point) the call will sit in the runtime suspend callback, ahead of the clock gating.
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 161
Quoted 5 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +5
-0+timer_delete_sync (&a_crtc->cfg_rdy_timer); + +/* Close the ISR's MMIO gate before the clocks actually stop. */ + a_crtc->clocks_on = false; +dpu_pm_suspend (a_crtc->dev);This whole DPU PM stuff doesn't seem to belong here. There's are device-PM ops for controlling power management. It might happen that compositors disable the CRTC for simple mode setting. This should not suspend the whole device.
Will do; it moves to runtime PM.
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 168
Quoted 6 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +6
-0+spin_lock_irq (&drm->event_lock); +if (crtc->state->event) { +drm_crtc_send_vblank_event (crtc, crtc->state->event); + crtc->state->event =NULL ; + } +spin_unlock_irq (&drm->event_lock);You need set up the vblank machinery to send the event on the next vblank irq. See [1] for a simple example.
Quoted 2 lines
[1]
https://elixir.bootlin.com/linux/v7.2.5/source/drivers/gpu/drm/drm_vblank_helper.c#L51
Will do. The event will be armed from the config-ready interrupt rather than in atomic_flush, since the next commit must not start before the hardware has taken the current command lists.
[...]
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 182
Quoted 1 line
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +1
-0+trace_spacemit_crtc_atomic_check (a_crtc->dev_id);Please don't add your own tracepoints.
Will do.
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 187
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +4
-0+ ret =spacemit_crtc_atomic_check_fbmem (crtc, state); +if (ret) { +drm_dbg_kms (crtc->dev, +"failed to satisfy fbcmem size for all rdmas\n" );Drivers should only use
drm_dbg().drm_dbg_kms()et al are for DRM core and helpers.
Will do.
[...]
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 234
Quoted 1 line
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +1
-0+if (WARN_ON (!crtc->state))There are helpers like
drm_WARN_ON()et al. Please prefer them overWARN_ON()and other non-DRM counterparts.
Will do.
[...]
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c line 587
Quoted 5 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c new file +5
-0+ ret =drm_vblank_init (drm, drm->mode_config.num_crtc); +if (ret) { +dev_err (dev,"failed to initialize vblank\n" ); + goto err_unbind_all; + }Better do this after running
drm_mode_config_reset().
Will do.
[...]
Quoted 14 lines
drivers/gpu/drm/spacemit/spacemit_planes.c line 93
Quoted 11 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +11
-0+/* The programming paths use the raw rectangles, so refuse to clip. */ +if ((state->src.x1 >>16 ) != src_x || (state->src.y1 >>16 ) != src_y || + (drm_rect_width (&state->src) >>16 ) != src_w || + (drm_rect_height (&state->src) >>16 ) != src_h || + state->dst.x1 != state->crtc_x || state->dst.y1 != state->crtc_y || +drm_rect_width (&state->dst) != crtc_w || +drm_rect_height (&state->dst) != crtc_h) { +drm_dbg_kms (plane->dev, +"clipped plane rectangles not supported\n" ); +return -EINVAL ; + }What's the matter with this code?
Quoted 2 lines
Allocated buffers can be larger than the display mode. If the hardware cannot handle this, it might become a problem in some setups.
It worked around the driver programming the unclipped rectangles. Will fix.
Quoted 9 lines
drivers/gpu/drm/spacemit/spacemit_planes.c line 100
Quoted 6 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +6
-0+/* One-dimensional sources are invalid (only 0x0 = constant fill) */ +if ((src_w ==0 ) != (src_h ==0 )) { +drm_dbg_kms (plane->dev,"unsupported src_w %d src_h %d\n" , + src_w, src_h); +return -EINVAL ; + }I'm not aware of any driver testing this. The above calculation of
state->visibleshould have detected this case.
Will do.
[...]
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +6
-0+ cur_state->mmu_tbl.size = + ((PAGE_ALIGN (fb->obj[0 ]->size) >>PAGE_SHIFT ) + +HW_ALIGN_TTB_NUM ) *4 ; + cur_state->mmu_tbl.va = + dma_alloc_coherent(a_crtc->dev, cur_state->mmu_tbl.size, + &cur_state->mmu_tbl.pa,
Quoted 8 lines
drivers/gpu/drm/spacemit/spacemit_planes.c line 130
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_planes.c new file +3
-0+ GFP_KERNEL | __GFP_ZERO); +if (!cur_state->mmu_tbl.va) +return -ENOMEM ;Resource allocation/deallocation like this should better be done in begin_fb_access/end_fb_access when you need them for the commit. User-space compositors might send in a large number of states only for atomic_check'ing. There's no point in allocating actual memory then.
Will move the allocation to prepare_fb.
Cody
PATCH v2 11/17 drm/spacemit: add Saturn DPU DRM device driver
In reply to Cody KangAdd the DRM device for the SpacemiT K3 Saturn display processing unit and hook the driver up to the build. The SoC has two DPU instances; each drives one CRTC that scans out a single primary plane in linear RGB at up to 3840x2160@60 and feeds a downstream DP/eDP controller over an OF-graph endpoint. Buffers use drm_gem_shmem_helper. The AFBC/compressed decode path is not exposed and writeback is not implemented.
---
v2:
- check for an ERR_PTR component match before component_master_add_with_match() (Sashiko)
- add a comment explaining why commit_tail waits for flip_done before commit_hw_done (Sashiko)
--- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/spacemit/Kconfig | 18 ++++ drivers/gpu/drm/spacemit/Makefile | 12 +++ drivers/gpu/drm/spacemit/spacemit_drm.c | 140 ++++++++++++++++++++++++++++++++ 5 files changed, 172 insertions(+)
drivers/gpu/drm/Kconfig +1 -0
@@ -341,6 +341,7 @@ source "drivers/gpu/drm/renesas/Kconfig" source "drivers/gpu/drm/rockchip/Kconfig" source "drivers/gpu/drm/sitronix/Kconfig" source "drivers/gpu/drm/solomon/Kconfig" +source "drivers/gpu/drm/spacemit/Kconfig" source "drivers/gpu/drm/sprd/Kconfig" source "drivers/gpu/drm/sti/Kconfig" source "drivers/gpu/drm/stm/Kconfig"
drivers/gpu/drm/Makefile +1 -0
@@ -204,6 +204,7 @@ obj-$(CONFIG_DRM_MSM) += msm/ obj-$(CONFIG_DRM_TEGRA) += tegra/ obj-$(CONFIG_DRM_STM) += stm/ obj-$(CONFIG_DRM_STI) += sti/ +obj-$(CONFIG_DRM_SPACEMIT) += spacemit/ obj-y += imx/ obj-$(CONFIG_DRM_INGENIC) += ingenic/ obj-$(CONFIG_DRM_LOGICVC) += logicvc/
drivers/gpu/drm/spacemit/Kconfig new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0 + +config DRM_SPACEMIT + tristate "DRM support for SpacemiT display controllers" + depends on DRM && OF && MMU + depends on ARCH_SPACEMIT || COMPILE_TEST + select DRM_CLIENT_SELECTION + select DRM_KMS_HELPER + select DRM_GEM_SHMEM_HELPER + select REGMAP_MMIO + select VIDEOMODE_HELPERS + help + Choose this option if you have a SpacemiT SoC with the Saturn + display processing unit, such as the K3. The DPU scans out + framebuffers through its private display MMU and feeds a + DisplayPort or embedded DisplayPort controller. + + If M is selected the module will be called spacemit-drm.
drivers/gpu/drm/spacemit/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0 + +spacemit-drm-y := spacemit_drm.o \ + spacemit_crtc.o \ + spacemit_cmdlist.o \ + spacemit_planes.o \ + spacemit_dmmu.o \ + dpu/dpu_saturn.o \ + dpu/dpu_saturn_hee.o \ + dpu/saturn_fbcmem.o + +obj-$(CONFIG_DRM_SPACEMIT) += spacemit-drm.o
drivers/gpu/drm/spacemit/spacemit_drm.c new file +140 -0
140 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 11/17] drm/spacemit: add Saturn DPU DRM device driver
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider: - [High] The driver calls sleeping delay functions (`usleep_range()`) from within CRTC atomic enable and…
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
- [High] The driver calls sleeping delay functions (usleep_range()) from within CRTC atomic enable and disable callbacks, violating DRM atomic context rules.
- [Medium] Setting drm_mode_config.max_width and max_height to a single CRTC's maximum resolution breaks multi-monitor support.
- [Medium] Missing error check after drm_of_component_match_add() inside the OF component loop causes device node reference leaks on subsequent iterations. --
--- Patch [11]: [PATCH v2 11/17] drm/spacemit: add Saturn DPU DRM device driver --- commit cbbaf4042bf32b29313b65d5c670b16c44e0fb03
Author: Cody Kang <[email protected]>
drm/spacemit: add Saturn DPU DRM device driver
Add the DRM device for the SpacemiT K3 Saturn display processing unit and hook the driver up to the build. The SoC has two DPU instances; each drives one CRTC that scans out a single primary plane in linear RGB at up to 3840x2160@60 and feeds a downstream DP/eDP controller over an OF-graph endpoint. Buffers use drm_gem_shmem_helper. The AFBC/compressed decode path is not exposed and writeback is not implemented.
Quoted 4 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +0
-0
[ ... ]
drivers/gpu/drm/spacemit/spacemit_drm.c line 70
Quoted 13 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +13
-0+int spacemit_drm_mode_config_init (struct drm_device *drm) +{ +int ret; + + ret =drmm_mode_config_init (drm); +if (ret) +return ret; + + drm->mode_config.min_width =1 ; + drm->mode_config.min_height =1 ; +/* K3 user manual: each DPU scans out at most 3840x2160@60 */ + drm->mode_config.max_width =3840 ; + drm->mode_config.max_height =2160 ;
[Severity: Medium]
Will setting max_width and max_height to a single CRTC's maximum resolution break multi-monitor support?
These values dictate the maximum dimensional bounds for the entire DRM framebuffer, not just a single CRTC's scanout. Windowing systems allocating a single large framebuffer to span all connected monitors might fail if they attempt to configure side-by-side dual monitors exceeding 3840x2160.
Quoted 6 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +6
-0+ + drm->mode_config.funcs = &spacemit_drm_mode_config_funcs; + drm->mode_config.helper_private = &spacemit_drm_mode_config_helper; + +return 0 ; +}
[ ... ]
Quoted 5 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +5
-0+int spacemit_drm_of_component_probe (struct device *dev) +{ +struct device_node *ports, *port, *ep; +struct device_node *remote; +struct component_match *match =NULL ;
[ ... ]
drivers/gpu/drm/spacemit/spacemit_drm.c line 125
Quoted 12 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +12
-0+for_each_child_of_node (ports, port) { +if (!of_node_name_eq (port,"port" )) +continue ; +for_each_child_of_node (port, ep) { +if (!of_node_name_eq (ep,"endpoint" )) +continue ; + remote =of_graph_get_remote_port_parent (ep); +if (!remote) +continue ; +if (of_device_is_available (remote)) +drm_of_component_match_add (dev, &match, + compare_of, remote);
[Severity: Medium]
Could this loop leak an OF device node reference on subsequent iterations if drm_of_component_match_add() fails and returns an error pointer?
If drm_of_component_match_add() encounters a memory allocation failure, it sets the match pointer to ERR_PTR(-ENOMEM). Because this loop does not check IS_ERR(match) to break out early, subsequent iterations will pass the error pointer back into the function.
Internally, drm_of_component_match_add() unconditionally calls of_node_get() to increment the reference count, but component_match_add_release() immediately returns without registering a release callback when the match pointer is already an error.
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +3
-0+of_node_put (remote); + } + }
[ ... ]
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c +0
-0
[ ... ]
Quoted 15 lines
static void spacemit_crtc_atomic_enable(struct
drm_crtc*crtc,drivers/gpu/drm/spacemit/spacemit_crtc.c +0
-0struct drm_atomic_commit *old_state) {struct spacemit_crtc *a_crtc =to_spacemit_crtc (crtc);struct spacemit_drm_private *priv = crtc->dev->dev_private;int idx;int ret;if (!drm_dev_enter (crtc->dev, &idx))return ;trace_spacemit_crtc_atomic_enable (a_crtc->dev_id);/* * U-Boot leaves its boot-logo pipeline running. Hard-stop it with the
drivers/gpu/drm/spacemit/spacemit_crtc.c
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c +0
-0* resets alone; the clocks are not ours to gate until we have enabled * them. */ if (unlikely (a_crtc->first_modeset)) { ret =reset_control_bulk_assert (ARRAY_SIZE (priv->pipe_resets), priv->pipe_resets);if (ret)dev_warn (a_crtc->dev,"failed to assert resets: %d\n" , ret);usleep_range (10000 ,20000 );
[Severity: High]
Does this code call a sleeping function from within atomic context?
CRTC atomic enable callbacks execute in atomic context, where sleeping is strictly forbidden. Calling usleep_range() here can cause kernel warnings, system instability, and potential deadlocks.
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c +0
-0a_crtc->first_modeset = false; }
[ ... ]
Quoted 6 lines
static int
dpu_pm_suspend(struct device *dev)
{drivers/gpu/drm/spacemit/spacemit_crtc.c +0
-0struct spacemit_drm_private *priv =dev_get_drvdata (dev);struct spacemit_crtc *a_crtc = priv->a_crtc;int ret;
drivers/gpu/drm/spacemit/spacemit_crtc.c
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_crtc.c +0
-0/* * Assert before gating: a reset asserted into an already-gated block * has no clock edges to propagate on and leaves the register file * untouched. */ ret =reset_control_bulk_assert (ARRAY_SIZE (priv->pipe_resets), priv->pipe_resets);if (ret)dev_warn (dev,"failed to assert resets: %d\n" , ret);usleep_range (10000 ,20000 );
[Severity: High]
Is this sleeping function also reached from atomic context?
Because dpu_pm_suspend() is called during CRTC atomic disable (via spacemit_crtc_atomic_disable()), this usleep_range() call also occurs in an atomic context where sleeping is forbidden.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=11
Re: [PATCH v2 11/17] drm/spacemit: add Saturn DPU DRM device driver
In reply to Cody KangQuoted 179 lines · 在 2026-08-09日的 21:14 +0800,Cody Kang via B4 Relay写道:
From: Cody Kang <[email protected]>
Add the DRM device for the SpacemiT K3 Saturn display processing unit and hook the driver up to the build. The SoC has two DPU instances; each drives one CRTC that scans out a single primary plane in linear RGB at up to 3840x2160@60 and feeds a downstream DP/eDP controller over an OF-graph endpoint. Buffers use
drm_gem_shmem_helper. The AFBC/compressed decode path is not exposed and writeback is not implemented.Signed-off-by Cody Kang <[email protected]>---
v2:
- check for anERR_PTRcomponent match beforecomponent_master_add_with_match()(Sashiko)
- add a comment explaining whycommit_tailwaits forflip_donebeforecommit_hw_done(Sashiko)
---
drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/spacemit/Kconfig | 18 ++++ drivers/gpu/drm/spacemit/Makefile | 12 +++drivers/gpu/drm/spacemit/spacemit_drm.c| 140
++++++++++++++++++++++++++++++++5 files changed, 172 insertions(+)drivers/gpu/drm/Kconfig +0
-0@@ -341,6 +341,7 @@ source "drivers/gpu/drm/renesas/Kconfig"source "
drivers/gpu/drm/rockchip/Kconfig"
source "drivers/gpu/drm/sitronix/Kconfig"
source "drivers/gpu/drm/solomon/Kconfig"
+source "drivers/gpu/drm/spacemit/Kconfig"
source "drivers/gpu/drm/sprd/Kconfig"
source "drivers/gpu/drm/sti/Kconfig"
source "drivers/gpu/drm/stm/Kconfig"drivers/gpu/drm/Makefile +0
-0@@ -204,6 +204,7 @@ obj-$(CONFIG_DRM_MSM) += msm/obj-$(CONFIG_DRM_TEGRA) += tegra/
obj-$(CONFIG_DRM_STM) += stm/
obj-$(CONFIG_DRM_STI) += sti/
+obj-$(CONFIG_DRM_SPACEMIT) += spacemit/
obj-y += imx/
obj-$(CONFIG_DRM_INGENIC) += ingenic/
obj-$(CONFIG_DRM_LOGICVC) += logicvc/drivers/gpu/drm/spacemit/Kconfig new file +13
-0@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0 + +config DRM_SPACEMIT + tristate "DRM support for SpacemiT display controllers" + depends on DRM && OF && MMU + depends on ARCH_SPACEMIT || COMPILE_TEST + select DRM_CLIENT_SELECTION + select DRM_KMS_HELPER + select DRM_GEM_SHMEM_HELPER + select REGMAP_MMIO + select VIDEOMODE_HELPERS + help + Choose this option if you have a SpacemiT SoC with theSaturn
drivers/gpu/drm/spacemit/Kconfig new file +5
-0+ display processing unit, such as the K3. The DPU scans out + framebuffers through its private display MMU and feeds a + DisplayPort or embedded DisplayPort controller. + + If M is selected the module will be called spacemit-drm.drivers/gpu/drm/spacemit/Makefile new file +12
-0@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0 + +spacemit-drm-y := spacemit_drm.o \ + spacemit_crtc.o \ + spacemit_cmdlist.o \ + spacemit_planes.o \ + spacemit_dmmu.o \ + dpu/dpu_saturn.o \ + dpu/dpu_saturn_hee.o \ + dpu/saturn_fbcmem.o + +obj-$(CONFIG_DRM_SPACEMIT) += spacemit-drm.odrivers/gpu/drm/spacemit/spacemit_drm.c new file +24
-0@@ -0,0 +1,140 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2025-2026 SpacemiT Co., Ltd. +* +*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_gem_shmem_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_fbdev_shmem.h> +#include <linux/component.h> +#include <linux/of_graph.h> + +#include "spacemit_drm.h" +#include "spacemit_crtc.h" + +#define DRIVER_NAME "spacemit" +#define DRIVER_DESC "SpacemiT SoC DRM driver" +#define DRIVER_MAJOR 1 +#define DRIVER_MINOR 0 + +static void spacemit_drm_atomic_commit_tail(struct drm_atomic_commit
*old_state)drivers/gpu/drm/spacemit/spacemit_drm.c new file +9
-0+{ +struct drm_device *dev = old_state->dev; + +drm_atomic_helper_commit_modeset_disables (dev, old_state); + +drm_atomic_helper_commit_modeset_enables (dev, old_state); + +drm_atomic_helper_commit_planes (dev, old_state, + DRM_PLANE_COMMIT_ACTIVE_ONLY);
drivers/gpu/drm/spacemit/spacemit_drm.c new file +3
-0+ +/* +* Flip first, hw_done second: the cmdlist engine reads the old
drivers/gpu/drm/spacemit/spacemit_drm.c new file +1
-0+* state's DMA buffers until the frame boundary, and hw_done both
drivers/gpu/drm/spacemit/spacemit_drm.c new file +1
-0+* releases the next commit to start programming and lets the old
drivers/gpu/drm/spacemit/spacemit_drm.c new file +10
-0+* state (with those buffers) be torn down. +*/ +drm_atomic_helper_wait_for_flip_done (dev, old_state); + +drm_atomic_helper_commit_hw_done (old_state); + +drm_atomic_helper_cleanup_planes (dev, old_state); +} + +static const struct drm_mode_config_helper_funcs
spacemit_drm_mode_config_helper= {drivers/gpu/drm/spacemit/spacemit_drm.c new file +4
-0+ .atomic_commit_tail = spacemit_drm_atomic_commit_tail, +}; + +static const struct drm_mode_config_funcs
spacemit_drm_mode_config_funcs= {drivers/gpu/drm/spacemit/spacemit_drm.c new file +16
-0+ .fb_create = drm_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +int spacemit_drm_mode_config_init (struct drm_device *drm) +{ +int ret; + + ret =drmm_mode_config_init (drm); +if (ret) +return ret; + + drm->mode_config.min_width =1 ; + drm->mode_config.min_height =1 ; +/* K3 user manual: each DPU scans out at most 3840x2160@60 */
drivers/gpu/drm/spacemit/spacemit_drm.c line 70
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +2
-0+ drm->mode_config.max_width =3840 ; + drm->mode_config.max_height =2160 ;
This is for the biggest possible framebuffer instead of the possible scanout pixel count.
The width here should be based on the maximum allowed pitch of the display controller instead of the single-GPU maximum size, otherwise it won't be able to drive two 3840x2160 screens in a side-by-side configuration because this will create a 7680x2160 framebuffer.
Thanks,
Icenowy
Quoted 77 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +3
-0+ + drm->mode_config.funcs = &spacemit_drm_mode_config_funcs; + drm->mode_config.helper_private =
&spacemit_drm_mode_config_helper;drivers/gpu/drm/spacemit/spacemit_drm.c new file +8
-0+ +return 0 ; +} + +DEFINE_DRM_GEM_FOPS (spacemit_drm_fops); + +struct drm_driver spacemit_drm_drv = { + .driver_features = DRIVER_GEM | DRIVER_MODESET |
DRIVER_ATOMIC,drivers/gpu/drm/spacemit/spacemit_drm.c new file +26
-0+ .fops = &spacemit_drm_fops, + +DRM_GEM_SHMEM_DRIVER_OPS , +DRM_FBDEV_SHMEM_DRIVER_OPS , + + .name = DRIVER_NAME, + .desc = DRIVER_DESC, + .major = DRIVER_MAJOR, + .minor = DRIVER_MINOR, +}; + +static int compare_of (struct device *dev,void *data) +{ +return dev->of_node == data; +} + +int spacemit_drm_of_component_probe (struct device *dev) +{ +struct device_node *ports, *port, *ep; +struct device_node *remote; +struct component_match *match =NULL ; + +if (!dev->of_node) +return -EINVAL ; + +/* The DPU is the drm root: its OF graph names the DP/eDP components. */
drivers/gpu/drm/spacemit/spacemit_drm.c new file +13
-0+ ports =of_get_child_by_name (dev->of_node,"ports" ); +if (!ports) { +dev_err (dev,"missing 'ports' child node\n" ); +return -EINVAL ; + } + +for_each_child_of_node (ports, port) { +if (!of_node_name_eq (port,"port" )) +continue ; +for_each_child_of_node (port, ep) { +if (!of_node_name_eq (ep,"endpoint" )) +continue ; + remote =
of_graph_get_remote_port_parent(ep);drivers/gpu/drm/spacemit/spacemit_drm.c new file +4
-0+if (!remote) +continue ; +if (of_device_is_available (remote)) + drm_of_component_match_add(dev,&match,
drivers/gpu/drm/spacemit/spacemit_drm.c new file +1
-0+
compare_of, remote);drivers/gpu/drm/spacemit/spacemit_drm.c new file +13
-0+of_node_put (remote); + } + } +of_node_put (ports); + +if (!match) { +dev_err (dev,"no downstream component available\n" ); +return -ENODEV ; + } +if (IS_ERR (match)) +return PTR_ERR (match); + + return component_master_add_with_match(dev,
&spacemit_drm_master_ops,drivers/gpu/drm/spacemit/spacemit_drm.c new file +2
-0+ match); +}
Re: [PATCH v2 11/17] drm/spacemit: add Saturn DPU DRM device driver
Hi Icenowy,
Quoted 2 lines · Icenowy Zheng
Quoted 1 line · 在 2026-08-09日的 21:14 +0800,Cody Kang via B4 Relay写道:
From: Cody Kang <[email protected]>
[...]
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_drm.c line 70
Quoted 6 lines
drivers/gpu/drm/spacemit/spacemit_drm.c new file +3
-0+ drm->mode_config.min_width =1 ; + drm->mode_config.min_height =1 ; +/* K3 user manual: each DPU scans out at most 3840x2160@60 */
drivers/gpu/drm/spacemit/spacemit_drm.c new file +2
-0+ drm->mode_config.max_width =3840 ; + drm->mode_config.max_height =2160 ;This is for the biggest possible framebuffer instead of the possible scanout pixel count.
Quoted 4 lines
The width here should be based on the maximum allowed pitch of the display controller instead of the single-GPU maximum size, otherwise it won't be able to drive two 3840x2160 screens in a side-by-side configuration because this will create a 7680x2160 framebuffer.
Thanks for the review. Agreed; will fix in v3.
v3 will take max_width/max_height from what the RDMA registers can address (a 16-bit byte stride and 16-bit image dimensions), and move the 3840x2160 limit into the CRTC's mode_valid.
Cody
Re: [PATCH v2 11/17] drm/spacemit: add Saturn DPU DRM device driver
In reply to Cody KangHi,
We have incorporated this patchset into the Ubuntu kernel for display support on the K3 platforms.
During testing, we found an issue: the screen would display artifacts all over, kind of like black lines blinking.
I have implemented the following patch to fix the issue:
drm/spacemit: map scanout buffers write-combining
The K3 display controller is not DMA-coherent: the DPU fetches scanout buffers straight from memory while fbcon and userspace write them through a cached CPU mapping. The shmem helpers clean the buffer only once, when the sg table is first built, so nothing flushes later CPU writes. Dirty cache lines shadow what the DPU scans out, and erased fbcon text lingers on screen until the lines are evicted by chance.
Add a gem_create_object() hook that sets map_wc on the shmem objects. The K3 harts implement Svpbmt, so the CPU mapping becomes genuinely non-cacheable and writes reach memory immediately; the one-time clean in dma_map_sgtable() still covers the initial contents.
--- drivers/gpu/drm/spacemit/spacemit_drm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/spacemit/spacemit_drm.c +16 -0
@@ -12,6 +12,7 @@#include <drm/drm_fbdev_shmem.h> #include <linux/component.h> #include <linux/of_graph.h> +#include <linux/slab.h> #include "spacemit_drm.h" #include "spacemit_crtc.h"
@@ -75,6 +76,20 @@ int spacemit_drm_mode_config_init(struct drm_device *drm)return 0 ; } +static struct drm_gem_object *spacemit_gem_create_object (struct drm_device *drm, +size_t size) +{ +struct drm_gem_shmem_object *shmem; + + shmem =kzalloc_obj (*shmem); +if (!shmem) +return ERR_PTR (-ENOMEM ); + + shmem->map_wc = true; + +return &shmem->base; +} +DEFINE_DRM_GEM_FOPS (spacemit_drm_fops);struct drm_driver spacemit_drm_drv = {
@@ -82,6 +97,7 @@ struct drm_driver spacemit_drm_drv = { .fops = &spacemit_drm_fops,DRM_GEM_SHMEM_DRIVER_OPS , + .gem_create_object = spacemit_gem_create_object,DRM_FBDEV_SHMEM_DRIVER_OPS , .name = DRIVER_NAME,
--
I'm sending this here in the hope that it will be useful for a future revision. Is there a v3 in preparation?
Thanks,
Sarah
Re: [PATCH v2 11/17] drm/spacemit: add Saturn DPU DRM device driver
Hi Sarah,
On Tue, 10 Nov 2026 18:02:42 +0100, Sarah Emery wrote:
[...]
Quoted 3 lines
I'm sending this here in the hope that it will be useful for a future revision.
Is there a v3 in preparation?
Thank you for the fix, and yes, a v3 is on the way. I am working on it with a friend, and it may be posted by him rather than by me.
I am glad you brought this up here on the list. I had already noticed your work: the series, with your two fixes on top, has been running in the Ubuntu 26.10 release on the SpacemiT K3 boards.
I would be honoured to have your Tested-by once v3 is out. Thanks again, and thanks to the Canonical team.
Cody
PATCH v2 12/17 drm/spacemit: add Innosilicon DP/eDP controller bridge driver
In reply to Cody KangAdd the DP/eDP controller that sits downstream of the Saturn DPU. Two identical instances share one compatible; the eDP-vs-DP role is board wiring, so it is taken from the devicetree: an eDP panel always sits under an aux-bus child node, an external DP connector never does.
The link is driven through the generic PHY framework, so the controller never touches a PLL register. The controller's HPD interrupt is gated by the DP pixel clock, which can be off exactly when a plug has to be caught, so the connector is also polled and the interrupt path re-reads the live level when it does fire.
---
v2:
- use devm_reset_control_get_exclusive_deasserted(), dropping the manual deassert/assert paths and the reset field (Philipp Zabel)
- hand the pxclk disable to a devm action registered after the PHY child is populated (Yao Zi)
- drop the dead NULL-clk guards (Yao Zi)
- drop the error message duplicated by devm_request_threaded_irq() (Yao Zi)
- ack the W1C DP_GENERAL_INTERRUPT bits with plain writes (Sashiko)
- return IRQ_HANDLED when the ISR consumed an HPD latch instead of IRQ_NONE (Sashiko)
- read EDID blocks through the aux I2C adapter (Sashiko)
- drop DRM_BRIDGE_OP_MODES from the DP branch (Sashiko)
- respond to Rob Herring's suggestion, port@1 required, compute possible_crtcs from the input endpoint only
--- drivers/gpu/drm/spacemit/Kconfig | 19 + drivers/gpu/drm/spacemit/Makefile | 3 + drivers/gpu/drm/spacemit/spacemit_inno_dp.c | 2391 +++++++++++++++++++++++++++ drivers/gpu/drm/spacemit/spacemit_inno_dp.h | 329 ++++ 4 files changed, 2742 insertions(+)
drivers/gpu/drm/spacemit/Kconfig +19 -0
@@ -16,3 +16,22 @@ config DRM_SPACEMIT DisplayPort or embedded DisplayPort controller. If M is selected the module will be called spacemit-drm. + +config SPACEMIT_INNO_DP + tristate "SpacemiT Innosilicon DP/eDP controller support" + depends on DRM_SPACEMIT + imply PHY_SPACEMIT_K3_INNO_DP + select GENERIC_PHY + select DRM_PANEL + select DRM_BRIDGE_CONNECTOR + select DRM_DISPLAY_HELPER + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_DP_AUX_BUS + help + Choose this option to enable the Innosilicon DisplayPort / + embedded DisplayPort transmitter integrated in SpacemiT SoCs. + The controller sits downstream of the Saturn DPU and drives an + eDP panel (discovered over the DP AUX bus) or an external + DisplayPort connector. + + If M is selected the module will be called spacemit-inno-dp.
drivers/gpu/drm/spacemit/Makefile +3 -0
@@ -9,4 +9,7 @@ spacemit-drm-y := spacemit_drm.o \ dpu/dpu_saturn_hee.o \ dpu/saturn_fbcmem.o +spacemit-inno-dp-y := spacemit_inno_dp.o + obj-$(CONFIG_DRM_SPACEMIT) += spacemit-drm.o +obj-$(CONFIG_SPACEMIT_INNO_DP) += spacemit-inno-dp.o
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +2391 -0
2,391 lines not on this page · raw message
drivers/gpu/drm/spacemit/spacemit_inno_dp.h new file +329 -0
329 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 12/17] drm/spacemit: add Innosilicon DP/eDP controller bridge driver
Thank you for your contribution! Sashiko AI review found 6 potential issue(s) to consider: - [High] Premature bridge and component registration before eDP panel probe completion breaks…
Thank you for your contribution! Sashiko AI review found 6 potential issue(s) to consider:
- [High] Premature bridge and component registration before eDP panel probe completion breaks drm_bridge_connector.
- [High] Incorrect lock acquired before calling drm_connector_set_link_status_property.
- [High] Infinite modeset loop caused by partial clearing of link capabilities on training failure.
- [Medium] Data race on DPCD and link capabilities during mode_valid and atomic_check.
- [Medium] AUX hardware reset during modesets races with concurrent AUX transfers.
- [Medium] Stale AUX interrupt status causes false completions on subsequent transfers.
--
--- Patch [12]: [PATCH v2 12/17] drm/spacemit: add Innosilicon DP/eDP controller bridge driver --- commit 67f4fc821826b59800af024c1981f9d4c8be1a74
Author: Cody Kang <[email protected]>
Subject: drm/spacemit: add Innosilicon DP/eDP controller bridge driver
This commit introduces the DisplayPort/embedded DisplayPort controller bridge driver for the SpacemiT Saturn DPU. It leverages the generic PHY framework and provides hotplug detection alongside link training mechanisms.
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +0
-0
[ ... ]
drivers/gpu/drm/spacemit/spacemit_inno_dp.c line 240
Quoted 13 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +13
-0+static void spacemit_dp_modeset_retry_work (struct work_struct *work) +{ + struct spacemit_dp_dev *dp = container_of(work, struct spacemit_dp_dev, + modeset_retry_work); +struct drm_connector *connector = dp->connector; + +if (!connector) +return ; + +mutex_lock (&connector->dev->mode_config.mutex); +drm_connector_set_link_status_property (connector, +DRM_MODE_LINK_STATUS_BAD ); +mutex_unlock (&connector->dev->mode_config.mutex);
[Severity: High]
Does this acquire the correct lock? The DRM core requires the caller to hold mode_config.connection_mutex (a drm_modeset_lock) to protect connection state. Calling drm_connector_set_link_status_property with just the standard mode_config.mutex triggers a lockdep warning and leaves the state unprotected against concurrent atomic commits.
[ ... ]
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +3
-0+static ssize_t spacemit_dp_aux_transfer (struct drm_dp_aux *aux, +struct drm_dp_aux_msg *msg) +{
[ ... ]
Quoted 24 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +24
-0+regmap_write_bits (dp->regs,DP_AUX_START_REG ,DP_AUX_START , +FIELD_PREP (DP_AUX_START ,0 )); +regmap_write_bits (dp->regs,DP_AUX_START_REG ,DP_AUX_START , +FIELD_PREP (DP_AUX_START ,1 )); + + timeout = jiffies +msecs_to_jiffies (200 ); + ret = -ETIMEDOUT ; + +while (1 ) { +regmap_read (dp->regs,DP_GENERAL_INTERRUPT , &val); + val =FIELD_GET (DP_AUX_REPLY_EVENT_INT_STA , val); +if (val) { + ret =0 ; +break ; + } +if (time_after (jiffies, timeout)) +break ; +usleep_range (100 ,110 ); + } + +if (ret) { +if (retries <SPACEMIT_DP_AUX_MAX_RETRIES ) { + retries++; +spacemit_dp_aux_hw_reset (dp);
drivers/gpu/drm/spacemit/spacemit_inno_dp.c line 401
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +10
-0+dev_dbg (dp->dev, +"AUX timeout, cmd=0x%x addr=0x%x size=%zu retry %d/%d\n" , + cmd, msg->address, msg->size, retries,SPACEMIT_DP_AUX_MAX_RETRIES ); + goto retry_eio; + } + +dev_err (dp->dev, +"AUX transfer timeout, req: 0x%x, cmd: 0x%x, addr: 0x%x, size %zu\n" , + msg->request, cmd, msg->address, msg->size); +return ret;
[Severity: Medium]
If a transfer times out and this returns -ETIMEDOUT, is the DP_AUX_REPLY_EVENT_INT_STA interrupt bit left uncleared?
If the hardware completes the transaction shortly after the timeout expires, this bit will be set. Since the next AUX transfer does not clear this bit before starting, its polling loop will instantly see the stale event bit and incorrectly assume the new transfer has completed.
Could this lead to reading garbage data and corrupting DPCD or EDID reads?
[ ... ]
drivers/gpu/drm/spacemit/spacemit_inno_dp.c line 499
Quoted 9 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +9
-0+static int spacemit_dp_hw_read_sink_caps (struct spacemit_dp_dev *dp) +{ +ssize_t ret; +u8 max_bw; +int retry; + +for (retry =0 ; retry <SPACEMIT_DP_SINK_READY_RETRIES ; retry++) { +if (retry) { +spacemit_dp_aux_hw_reset (dp);
[Severity: Medium]
Can this reset disrupt concurrent AUX transfers initiated by userspace?
The driver issues a hardware reset to the AUX controller here and in spacemit_dp_link_disable() without holding dp->aux.hw_mutex. If a concurrent AUX transfer is initiated (e.g., via /dev/drm_dp_auxN) while a modeset or detect operation is occurring, the hardware reset could corrupt or abort the in-flight transfer.
[ ... ]
Quoted 8 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +8
-0+static enum drm_mode_status +spacemit_dp_bridge_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +struct spacemit_dp_dev *dp =container_of (bridge, + struct spacemit_dp_dev, + bridge);
drivers/gpu/drm/spacemit/spacemit_inno_dp.c line 1366
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +10
-0+unsigned int max_link_rate, max_lanes; +u64 max_bw, req_bw; +const unsigned int bpp =24 ; + +/* +* drm_dp_max_link_rate() is in 10 kHz units; clamp to what the PHY can +* do. +*/ + max_link_rate = min_t(unsigned int, drm_dp_max_link_rate(dp->dpcd), +SPACEMIT_DP_SOURCE_MAX_RATE /10 );
[Severity: Medium]
Is it safe to read dp->dpcd here without holding dp->mode_lock?
These hardware capability properties are updated in spacemit_dp_hw_read_sink_caps(), which runs from the hotplug threaded IRQ handler while holding dp->mode_lock. Reading them here without the lock could expose a data race where concurrent hotplug events result in torn reads of the capabilities array.
[ ... ]
Quoted 3 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +3
-0+static void spacemit_dp_bridge_atomic_enable (struct drm_bridge *bridge, +struct drm_atomic_commit *state) +{
[ ... ]
Quoted 7 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +7
-0+if (!trained) { +dev_err (dp->dev, +"no usable link config; leaving video disabled (%u kHz x%u lanes)\n" , + dp->link.max_rate, dp->link.max_num_lanes); +/* +* The caps may be from a sink that has since been swapped out. +*/
drivers/gpu/drm/spacemit/spacemit_inno_dp.c line 1545
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +10
-0+ dp->link.max_rate =0 ; + dp->link.max_num_lanes =0 ; + +/* +* Deferred: we are inside the commit and hold the modeset +* locks. +*/ +schedule_work (&dp->modeset_retry_work); +return ; + }
[Severity: High]
Does clearing dp->link.max_rate but not the raw dp->dpcd array cause an infinite modeset loop on training failure?
When link training fails, the driver sets max_rate to 0 and schedules a link status retry but leaves the raw dp->dpcd array untouched. When the hotplug event prompts userspace to request a new modeset:
spacemit_dp_bridge_mode_valid() will accept the failing mode because it reads from the unchanged dp->dpcd.
spacemit_dp_bridge_atomic_check() will accept it because max_rate is 0, causing it to unconditionally return success.
spacemit_dp_bridge_atomic_enable() then attempts to train the link again, fails again, and repeats the cycle indefinitely, wedging the display server.
[ ... ]
Quoted 5 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +5
-0+static int spacemit_dp_bridge_atomic_check (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state) +{
[ ... ]
drivers/gpu/drm/spacemit/spacemit_inno_dp.c line 1589
Quoted 5 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +5
-0+/* No caps yet: leave idx unset and let ->atomic_enable() retry. */ +if (!dp->link.max_rate || !dp->link.max_num_lanes) { + st->link_cfg_idx =-1 ; +return 0 ; + }
[Severity: Medium]
Similar to the read in spacemit_dp_bridge_mode_valid(), is it safe to read the dp->link properties without holding dp->mode_lock here?
[ ... ]
Quoted 2 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +2
-0+static int inno_dp_probe (struct platform_device *pdev) +{
[ ... ]
Quoted 28 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +28
-0+/* +* eDP hands panel power, enable-GPIO and backlight to panel-edp over +* the AUX bus. A DP instance has no aux-bus child and takes the +* -ENODEV path. +*/ +if (dp->edp_mode) { + ret =devm_of_dp_aux_populate_bus (&dp->aux, + spacemit_dp_edp_link_panel); +if (ret) { +dev_err_probe (dev, ret, +"eDP: failed to populate aux-bus panel\n" ); +return ret; + } + } + +/* +* drm_bridge_attach() expects the bridge to already be on the global +* list. +*/ + ret =devm_drm_bridge_add (dev, &dp->bridge); +if (ret) { +dev_err (dev,"failed to register DP bridge: %d\n" , ret); +return ret; + } + +platform_set_drvdata (pdev, dp); + +/*
drivers/gpu/drm/spacemit/spacemit_inno_dp.c line 2342
Quoted 10 lines
drivers/gpu/drm/spacemit/spacemit_inno_dp.c new file +10
-0+* The handler needs bind-created state, so keep the line disabled until +* bind. +*/ + ret =devm_request_threaded_irq (dev, dp->irq, spacemit_dp_irq_handler, + spacemit_dp_hotplug_event_handler, +IRQF_NO_AUTOEN ,dev_name (dev), dp); +if (ret) +return ret; + + ret =component_add (dev, &spacemit_dp_ops);
[Severity: High]
Does registering the component here before the eDP panel finishes probing break drm_bridge_connector?
The driver calls devm_drm_bridge_add() and component_add() right after asking the AUX bus to asynchronously probe the eDP panel. This signals to the DRM master that this component is ready, prompting it to bind and build the connector immediately.
Since drm_bridge_connector_init() captures the capabilities of the bridge chain statically, the late attachment of the panel bridge in spacemit_dp_edp_link_panel() goes unnoticed by the connector. This results in the eDP panel missing its modes and panel-specific properties.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=12
PATCH v2 13/17 MAINTAINERS: add SpacemiT K3 display driver entry
In reply to Cody KangCover the Saturn DPU, the Innosilicon DP/eDP controller, the DP PHY and their bindings.
---
v2:
- no change
--- MAINTAINERS | 10 ++++++++++ 1 file changed, 10 insertions(+)
MAINTAINERS +10 -0
@@ -25436,6 +25436,16 @@ S: Maintained F: Documentation/devicetree/bindings/i2c/spacemit,k1-i2c.yaml F: drivers/i2c/busses/i2c-k1.c +SPACEMIT K3 DISPLAY DRIVER +M: Cody Kang <[email protected]> +L: [email protected] +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/display/spacemit/ +F: Documentation/devicetree/bindings/phy/spacemit,k3-inno-dp-phy.yaml +F: drivers/gpu/drm/spacemit/ +F: drivers/phy/spacemit/phy-k3-inno-dp.c + SPANISH DOCUMENTATION M: Carlos Bilbao <[email protected]> R: Avadhut Naik <[email protected]>
Signature · 1 line
2.43.0
PATCH v2 14/17 riscv: dts: spacemit: k3: add display nodes
In reply to Cody KangAdd the SoC-level display nodes: the two Saturn DPUs, the two DP/eDP controllers with their PHY children.
The PHY PLLs are fed back into the APMU as pixel-clock mux parents, so updated the &syscon_apmu node in the display dtsi.
---
v2:
- edp0/dp1: add port@1 with a board-completable endpoint, needed once the binding requires port@1 (Rob Herring, on patch 03)
--- arch/riscv/boot/dts/spacemit/k3-display.dtsi | 166 +++++++++++++++++++++++++++ 1 file changed, 166 insertions(+)
arch/riscv/boot/dts/spacemit/k3-display.dtsi new file +166 -0
@@ -0,0 +1,166 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * SpacemiT K3 display subsystem (DPU0/eDP0 + DPU1/DP1) shared + * device-tree definitions for inclusion alongside k3.dtsi. + * + * Copyright (C) 2026 SpacemiT Co., Ltd. + */ + +#include <dt-bindings/clock/spacemit,k3-clocks.h> +#include <dt-bindings/reset/spacemit,k3-resets.h> +#include <dt-bindings/interrupt-controller/irq.h> + +&soc { + dpu0_crtc0: dpu@c0340000 { + compatible = "spacemit,k3-saturn-dpu"; + reg = <0x0 0xc0340000 0x0 0x54000>; + interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, + <89 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "online", "offline"; + clocks = <&syscon_apmu CLK_APMU_LCD_PXCLK>, + <&syscon_apmu CLK_APMU_LCD_MCLK>, + <&syscon_apmu CLK_APMU_DPU_ACLK>, + <&syscon_apmu CLK_APMU_DSI_ESC>, + <&syscon_apmu CLK_APMU_LCD_DSC>; + clock-names = "pxclk", "mclk", "aclk", "escclk", "dscclk"; + resets = <&syscon_apmu RESET_APMU_LCD_MCLK>, + <&syscon_apmu RESET_APMU_LCD>, + <&syscon_apmu RESET_APMU_DSI_ESC>, + <&syscon_apmu RESET_APMU_DPU_ACLK>, + <&syscon_apmu RESET_APMU_LCD_DSCCLK>; + reset-names = "mclk", "lcd", "esc", + "aclk", "dsc"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dpu0_out: endpoint { + remote-endpoint = <&edp0_in>; + }; + }; + }; + }; + + edp0: edp@cac84000 { + compatible = "spacemit,k3-inno-dp"; + reg = <0x0 0xcac84000 0x0 0x4000>; + interrupts = <132 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon_apmu CLK_APMU_EDP0_PXCLK>, <&edp0_phy>; + clock-names = "pxclk", "pll"; + resets = <&syscon_apmu RESET_APMU_EDP0>; + phys = <&edp0_phy>; + phy-names = "dp"; + status = "disabled"; + + edp0_phy: phy { + compatible = "spacemit,k3-inno-dp-phy"; + #phy-cells = <0>; + #clock-cells = <0>; + clock-output-names = "edp0_pll_pxclk"; + }; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + edp0_in: endpoint { + remote-endpoint = <&dpu0_out>; + }; + }; + + port@1 { + reg = <1>; + edp0_out: endpoint { + }; + }; + }; + }; + + dpu1_crtc0: dpu@c0440000 { + compatible = "spacemit,k3-saturn-dpu"; + reg = <0x0 0xc0440000 0x0 0x54000>; + interrupts = <139 IRQ_TYPE_LEVEL_HIGH>, + <138 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "online", "offline"; + clocks = <&syscon_apmu CLK_APMU_DSI4LN2_LCD_PXCLK>, + <&syscon_apmu CLK_APMU_DSI4LN2_LCD_MCLK>, + <&syscon_apmu CLK_APMU_DSI4LN2_DPU_ACLK>, + <&syscon_apmu CLK_APMU_DSI4LN2_DSI_ESC>, + <&syscon_apmu CLK_APMU_DSI4LN2_LCD_DSC>; + clock-names = "pxclk", "mclk", "aclk", "escclk", "dscclk"; + resets = <&syscon_apmu RESET_APMU_DSI4LN2_LCD_MCLK>, + <&syscon_apmu RESET_APMU_DSI4LN2_LCD_SW>, + <&syscon_apmu RESET_APMU_DSI4LN2_ESCCLK>, + <&syscon_apmu RESET_APMU_DSI4LN2_DPU_ACLK>, + <&syscon_apmu RESET_APMU_DSI4LN2_LCD_DSCCLK>; + reset-names = "mclk", "lcd", "esc", + "aclk", "dsc"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dpu1_out: endpoint { + remote-endpoint = <&dp1_in>; + }; + }; + }; + }; + + dp1: dp@cac88000 { + compatible = "spacemit,k3-inno-dp"; + reg = <0x0 0xcac88000 0x0 0x4000>; + interrupts = <140 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon_apmu CLK_APMU_EDP1_PXCLK>, <&dp1_phy>; + clock-names = "pxclk", "pll"; + resets = <&syscon_apmu RESET_APMU_EDP1>; + phys = <&dp1_phy>; + phy-names = "dp"; + status = "disabled"; + + dp1_phy: phy { + compatible = "spacemit,k3-inno-dp-phy"; + #phy-cells = <0>; + #clock-cells = <0>; + clock-output-names = "edp1_pll_pxclk"; + }; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dp1_in: endpoint { + remote-endpoint = <&dpu1_out>; + }; + }; + + port@1 { + reg = <1>; + dp1_out: endpoint { + }; + }; + }; + }; +}; + +/* + * Feed the PHY PLL pixel clocks back in as the APMU mux parents. This lives + * here, not in k3.dtsi: the PHYs only exist where this file is included. + */ +&syscon_apmu { + clocks = <&osc_32k>, <&vctcxo_1m>, <&vctcxo_3m>, <&vctcxo_24m>, + <&edp0_phy>, <&dp1_phy>; + clock-names = "osc", "vctcxo_1m", "vctcxo_3m", "vctcxo_24m", + "edp0_pll_pxclk", "edp1_pll_pxclk"; +};
Signature · 1 line
2.43.0
PATCH v2 15/17 riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
In reply to Cody KangPico-ITX brings the second DPU's output to an external DisplayPort connector. Enable that DPU and the DisplayPort controller it feeds.
---
v2:
- no change
--- arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 11 +++++++++++ arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi | 11 +++++++++++ 2 files changed, 22 insertions(+)
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +11 -0
@@ -6,6 +6,7 @@ #include <dt-bindings/gpio/gpio.h> #include "k3.dtsi" +#include "k3-display.dtsi" #include "k3-pinctrl.dtsi" / {
@@ -221,3 +222,13 @@ hub@1 { &usb2_phy { status = "okay"; }; + +&dpu1_crtc0 { + status = "okay"; +}; + +&dp1 { + pinctrl-names = "default"; + pinctrl-0 = <&dp1_1_cfg>; + status = "okay"; +};
arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi +11 -0
@@ -11,6 +11,17 @@ #define K3_GPIO(x) (x / 32) (x % 32) &pinctrl { + /omit-if-no-ref/ + dp1_1_cfg: dp1-1-cfg { + dp1-pins { + pinmux = <K3_PADCONF(24, 6)>; /* dp1 hpd */ + + bias-disable; + drive-strength = <25>; + power-source = <3300>; + }; + }; + gmac0_rgmii_0_cfg: gmac0-rgmii-0-cfg { gmac0-rgmii-0-pins { pinmux = <K3_PADCONF(0, 1)>, /* gmac0_rxdv */
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v2 15/17] riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Missing `dp-connector` node and `remote-endpoint` link for the external DisplayPort output, leaving…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Missing dp-connector node and remote-endpoint link for the external DisplayPort output, leaving the dp1_out graph endpoint disconnected. --
--- Patch [15]: [PATCH v2 15/17] riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output --- commit 524eda119bdbf5fa2382226e4f89b196aad432d5
Author: Cody Kang <[email protected]>
riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
This commit enables the second DPU and the associated DisplayPort controller to provide output to the external DisplayPort connector on the Pico-ITX board.
Quoted 4 lines
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +0
-0
[ ... ]
Quoted 4 lines
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +0
-0@@ -221,3 +222,13 @@ hub@1 { &usb2_phy { status = "okay"; };
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts hub@1 { · line 234
Quoted 10 lines
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +10
-0+ +&dpu1_crtc0 { + status = "okay"; +}; + +&dp1 { + pinctrl-names = "default"; + pinctrl-0 = <&dp1_1_cfg>; + status = "okay"; +};
[Severity: Low]
Does this device tree need a dp-connector node and a remote-endpoint link for the external DisplayPort output?
Since dp1 is enabled here without describing the physical downstream connector or linking it to the output port, it appears to leave the dp1_out graph endpoint disconnected.
Even though the display driver might handle this missing topology gracefully by falling back to an internal connector initialization, could this omission trigger dtbs_check graph warnings for the dangling endpoint?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=15
Re: [PATCH v2 15/17] riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
In reply to Cody KangQuoted 4 lines · 在 2026-08-09日的 21:14 +0800,Cody Kang via B4 Relay写道:
From: Cody Kang <[email protected]>
Pico-ITX brings the second DPU's output to an external DisplayPort connector. Enable that DPU and the DisplayPort controller it feeds.
The connector available on the Pico-ITX mainboard isn't a DisplayPort port -- it's a USB Type-C port instead.
I think you need to model the Type-C port and alt functions of it.
Thanks,
Icenowy
Quoted 63 lines
Signed-off-by Cody Kang <[email protected]>---
v2:
- no change
---
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 11 +++++++++++arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi| 11 +++++++++++2 files changed, 22 insertions(+)arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +0
-0@@ -6,6 +6,7 @@ #include <dt-bindings/gpio/gpio.h>
#include "k3.dtsi"
+#include "k3-display.dtsi"
#include "k3-pinctrl.dtsi"
/ {arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +10
-0@@ -221,3 +222,13 @@ hub@1 { &usb2_phy { status = "okay"; }; + +&dpu1_crtc0 { + status = "okay"; +}; + +&dp1 { + pinctrl-names = "default"; + pinctrl-0 = <&dp1_1_cfg>; + status = "okay"; +};arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi +0
-0@@ -11,6 +11,17 @@ #define K3_GPIO(x) (x / 32) (x % 32)
&pinctrl {arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi +4
-0+ /omit-if-no-ref/ + dp1_1_cfg: dp1-1-cfg { + dp1-pins { + pinmux = <K3_PADCONF(24, 6)>; /* dp1 hpd*/
arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi +7
-0+ + bias-disable; + drive-strength = <25>; + power-source = <3300>; + }; + }; +
gmac0_rgmii_0_cfg: gmac0-rgmii-0-cfg {
gmac0-rgmii-0-pins {
pinmux = <K3_PADCONF(0, 1)>, /*gmac0_rxdv*/
Re: [PATCH v2 15/17] riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
Hi Icenowy,
Quoted 2 lines · Icenowy Zheng
The connector available on the Pico-ITX mainboard isn't a DisplayPort port -- it's a USB Type-C port instead.
Right, it is a Type-C receptacle, and the commit message should say so.
Quoted 1 line
I think you need to model the Type-C port and alt functions of it.
I am not sure that can be done on this board. The redriver/mux in front of the receptacle and the PD controller that steers it both sit on the EC's own I2C bus, and their interrupt goes to the EC too. The SoC has no bus to either chip; all it gets from that side is the DP1 HPD line.
So a usb-c-connector node would have nothing to link to here.
Guodong
Re: [PATCH v2 15/17] riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
Quoted 10 lines · 在 2026-11-17二的 15:51 -0500,Guodong Xu写道:
Hi Icenowy,
Quoted 3 lines · Icenowy Zheng
The connector available on the Pico-ITX mainboard isn't a DisplayPort
port -- it's a USB Type-C port instead.Right, it is a Type-C receptacle, and the commit message should say so.
Quoted 7 lines
Quoted 1 line
I think you need to model the Type-C port and alt functions of it.
I am not sure that can be done on this board. The redriver/mux in front of the receptacle and the PD controller that steers it both sit on the EC's own I2C bus, and their interrupt goes to the EC too. The SoC has no bus to either chip; all it gets from that side is the DP1 HPD line.
The ChromeOS EC firmware exposes some control for a Type-C port, you can search for google,cros-ec-typec and google,extcon-usbc-cros-ec compatible string in arch/arm64/boot/dts for more details.
Although the K3 Pico ITX hardware connects the EC to the SoC with some not-so-embedded interface (eSPI), which needs to be handled first.
Thanks,
Icenowy
Quoted 4 lines
So a usb-c-connector node would have nothing to link to here.
Guodong
Re: [PATCH v2 15/17] riscv: dts: spacemit: k3-pico-itx: enable the DisplayPort output
Hi Icenowy, Guodong,
Quoted 8 lines · Icenowy Zheng
Quoted 7 lines · 在 2026-11-17二的 15:51 -0500,Guodong Xu写道:
Quoted 3 lines · Icenowy Zheng
The connector available on the Pico-ITX mainboard isn't a DisplayPort
port -- it's a USB Type-C port instead.Right, it is a Type-C receptacle, and the commit message should say so.
Agreed; v3 will say Type-C receptacle in the commit message.
Quoted 8 lines
Quoted 7 lines
Quoted 1 line
I think you need to model the Type-C port and alt functions of it.
I am not sure that can be done on this board. The redriver/mux in front of the receptacle and the PD controller that steers it both sit on the EC's own I2C bus, and their interrupt goes to the EC too. The SoC has no bus to either chip; all it gets from that side is the DP1 HPD line.
Quoted 6 lines
The ChromeOS EC firmware exposes some control for a Type-C port, you can search for
google,cros-ec-typecandgoogle,extcon-usbc-cros-eccompatible string inarch/arm64/boot/dtsfor more details.Although the K3 Pico ITX hardware connects the EC to the SoC with some not-so-embedded interface (eSPI), which needs to be handled first.
Thanks for the pointers, and thanks both for the review. With that, I think in v3 I will leave the dp1_out endpoint unconnected, as it is in v2. Let me know if you disagree.
Cody
PATCH v2 16/17 riscv: dts: spacemit: k3-com260-ifx: enable the DisplayPort output
In reply to Cody KangCoM260-IFX carries a single DisplayPort output, so the second DPU and the DisplayPort controller it feeds are enabled.
---
v2:
- describe the DP receptacle (dp-connector) and link it to dp1 port@1 (Rob Herring, on patch 03)
--- arch/riscv/boot/dts/spacemit/k3-com260-ifx.dts | 27 ++++++++++++++++++++++++++ arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi | 11 +++++++++++ 2 files changed, 38 insertions(+)
arch/riscv/boot/dts/spacemit/k3-com260-ifx.dts +27 -0
@@ -5,6 +5,7 @@ */ #include "k3-com260.dtsi" +#include "k3-display.dtsi" / { model = "SpacemiT K3 CoM260 IFX";
@@ -18,4 +19,30 @@ aliases { chosen { stdout-path = "serial0:115200n8"; }; + + connector { + compatible = "dp-connector"; + label = "DP1"; + type = "full-size"; + + port { + dp1_connector_in: endpoint { + remote-endpoint = <&dp1_out>; + }; + }; + }; +}; + +&dpu1_crtc0 { + status = "okay"; +}; + +&dp1 { + pinctrl-names = "default"; + pinctrl-0 = <&dp1_3_cfg>; + status = "okay"; +}; + +&dp1_out { + remote-endpoint = <&dp1_connector_in>; };
arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi +11 -0
@@ -22,6 +22,17 @@ dp1-pins { }; }; + /omit-if-no-ref/ + dp1_3_cfg: dp1-3-cfg { + dp1-pins { + pinmux = <K3_PADCONF(72, 4)>; /* dp1 hpd */ + + bias-disable; + drive-strength = <25>; + power-source = <3300>; + }; + }; + gmac0_rgmii_0_cfg: gmac0-rgmii-0-cfg { gmac0-rgmii-0-pins { pinmux = <K3_PADCONF(0, 1)>, /* gmac0_rxdv */
Signature · 1 line
2.43.0
PATCH v2 17/17 riscv: defconfig: spacemit: k3: enable display driver
In reply to Cody KangEnable the Saturn DPU and the DP/eDP controller as modules, matching the other DRM drivers in this defconfig; the DP PHY follows through the controller's imply.
---
v2:
- no change
--- arch/riscv/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/riscv/configs/defconfig +2 -0
@@ -191,6 +191,8 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_DRM=m CONFIG_DRM_RADEON=m CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_SPACEMIT=m +CONFIG_SPACEMIT_INNO_DP=m CONFIG_DRM_SUN4I=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_FB=y
Signature · 1 line
2.43.0
Quoted 67 lines · On Sun Aug 9, 2026 at 9:14 PM CST, Cody Kang via B4 Relay wrote:
This series adds display support for the SpacemiT K3 [2], a RISC-V SoC:
a new DRM driver, a new PHY driver and three new bindings.The display path is three blocks deep:
Saturn DPU -> Innosilicon DP/eDP controller -> Innosilicon DP PHY
In v2, two major improvements:
- Module unload is now robust.
- The bindings now require the controller's output port (port@1).The rest of the v2 changes please see below, with details in each patch's changelog.
Sashiko AI review contributed total review comments: 57 items, which I
accepted: 14 items.v2 repeated the full v1 test matrix on both boards, in built-in and modular configurations, plus the new module load/unload rounds.
The v1 cover letter follows below, unchanged, to provide some backgroud (I can remove them from cover letter in next version):
The Saturn DPU is SpacemiT's own display processing unit. It has a private address translation unit and a command-list composer that replays a batch of register writes when a flush is latched. It exposes one CRTC with one primary plane. The K3 instantiates two DPUs, one per display path.
The DPU driver arrives as five staged patches to keep each one a reasonable size. The driver only becomes buildable with that last patch. Bisect safe.
The DP/eDP controller and its PHY are Innosilicon IP, also two instances of each. An instance behaves as embedded DisplayPort or as external DisplayPort purely according to what its output port is wired to, so the bindings do not distinguish them. The PHY's registers are interleaved with the controller's inside one MMIO window, which is why it is described as a child node and shares the controller's regmap.
The pixel clock is generated by the DP PHY's PLL, and the SoC's APMU pixel-clock mux takes that PLL as an input. Rather than let the display driver reach into PHY registers, the PHY registers its PLL as a clock provider and the APMU mux is parented to it through the clock framework. That is what patches 2, 4, 5 and 6 are for, and it is also what keeps the APMU and the DP/eDP controller out of a devicetree provider cycle.
As a first posting of the K3 display subsystem, this patchset supports:
a single primary plane per CRTC, linear RGB scanout (no plane scaling, rotation, YUV or writeback). It does not support DSI, DSC or DP audio, and link rates are capped at HBR2.Based on drm-misc-next at commit
5b9af25f2d0b("accel/ivpu: Remove unnecessary min_t()/max_t() usage"), v7.2-rc2 based.Testing this series needs a SpacemiT u-boot carrying display support [1]. SpacemiT expects to add that support into an official u-boot release in August 2026.
Tested on two K3 boards:
- Pico-ITX: an eDP panel and an external DisplayPort monitor.
- CoM260-IFX: DisplayPort only, no eDP.Note: The eDP panel DTS enablement is not part of this series; a separate
series will follow showing how eDP can be verified.
Quoted 6 lines
What was run on both boards, with modetest from libdrm and with kmscube:
- modetest -s, looped over 1920x1080, 1280x720 and 3840x2160
on DisplayPort and 2560x1600 on eDP- kmscube, on each head and on both at once
- hot-plug and sink swap on the DisplayPort connector
Hi Cody,
Tested the series on a K3 Pico-ITX (mainline v7.3-rc2 + these patches, display drivers built in). On the DisplayPort output:
- modetest -s: 1920x1080 and 1280x720 OK (native 2560x1440 as well); 3840x2160 not tested: my monitor has no such mode.
- kmscube: OK.
- hot-plug: unplug/replug detected, output re-enables fine.
Tested with the stock vendor U-Boot (2022.10); DP works fine with it.