Skip to content

drm: sun4i: add Display Engine 3.3 (DE33) support

Chris Morgan dri-devel linux-devicetree linux-sunxi 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v9 Latest24 patches 12 repliesIn review
  2. v22 patches 3 repliesApplied
  3. v12 patches 2 repliesSuperseded

Changes in v9 from the cover letter

- Combined the DE33 [1] series and the LCD [2] series to better track all patches necessary to output to an LCD display for the Allwinner H700.
- Added a required LVDS reset as requested here [3].
- Added compatible strings with a fallback for allwinner,sun50i-h616-display-engine, allwinner,sun50i-h616-tcon-top, and allwinner,sun50i-h616-sram-c.
- Added binding documentation for the LCD controller.
- Renamed the de3_sram device tree node to de33_sram.
- Corrected the LVDS reset for the LCD controller binding.
- Removed the PWM pins from the pincontroller bindings, as PWM is not yet supported.
- Reordered the patches so that a binding or a device tree node is not referenced before it is defined.

[1] https://lore.kernel.org/linux-sunxi/[email protected]/
[2] https://lore.kernel.org/linux-sunxi/[email protected]/
[3] https://lore.kernel.org/linux-sunxi/38669808.XM6RcZxFsP@jernej-laptop/

Patches in v9 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/24dt-bindings: clock: sun50i-h616-ccu: Add LVDS resetinclude/dt-bindings/reset/sun50i-h616-ccu.h+1 -01 reply
2/24clk: sunxi-ng: h616: Add LVDS reset for LCD TCONdrivers/clk/sunxi-ng/ccu-sun50i-h616.c+1 -04 replies
3/24drm: sun4i: de2/de3: add mixer version enumdrivers/gpu/drm/sun4i/sun8i_csc.c drivers/gpu/drm/sun4i/sun8i_mixer.c drivers/gpu/drm/sun4i/sun8i_mixer.h +3 more+23 -130 replies
4/24drm: sun4i: de2/de3: refactor mixer initialisationdrivers/gpu/drm/sun4i/sun8i_mixer.c+34 -300 replies
5/24drm: sun4i: de2/de3: add generic blender register reference functiondrivers/gpu/drm/sun4i/sun8i_mixer.h+6 -00 replies
6/24drm: sun4i: de2/de3: use generic register reference function for layer configurationdrivers/gpu/drm/sun4i/sun8i_mixer.c drivers/gpu/drm/sun4i/sun8i_ui_layer.c drivers/gpu/drm/sun4i/sun8i_vi_layer.c+12 -60 replies
7/24dt-bindings: allwinner: add H616 DE33 bus bindingDocumentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml+3 -40 replies
8/24dt-bindings: allwinner: add H616 DE33 clock bindingDocumentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml+1 -00 replies
9/24dt-bindings: allwinner: add H616 DE33 mixer bindingDocumentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml+32 -20 replies
10/24clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) supportdrivers/clk/sunxi-ng/ccu-sun8i-de2.c+25 -00 replies
11/24drm: sun4i: de33: vi_scaler: add Display Engine 3.3 (DE33) supportdrivers/gpu/drm/sun4i/sun8i_ui_layer.c drivers/gpu/drm/sun4i/sun8i_vi_scaler.c+19 -50 replies
12/24drm: sun4i: de33: mixer: add Display Engine 3.3 (DE33) supportdrivers/gpu/drm/sun4i/sun8i_mixer.c drivers/gpu/drm/sun4i/sun8i_mixer.h+90 -140 replies
13/24drm: sun4i: de33: mixer: add mixer configuration for the H616drivers/gpu/drm/sun4i/sun8i_mixer.c+15 -00 replies
14/24dt-bindings: allwinner: Add TCON_TOP and TCON_LCD clock/reset definesinclude/dt-bindings/clock/sun8i-tcon-top.h+2 -00 replies
15/24dt-bindings: display: sun4i: Add compatible strings for H616 DEDocumentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml+22 -170 replies
16/24dt-bindings: display: sun4i: Add compatible strings for H616 TCON TOPDocumentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml+9 -40 replies
17/24dt-bindings: sram: sunxi-sram: Add H616 SRAM C compatibleDocumentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml+3 -10 replies
18/24dt-bindings: display: Add R40 and H616 display engine compatiblesDocumentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml+10 -00 replies
19/24drm/sun4i: tcon: Add support for R40 LCDdrivers/gpu/drm/sun4i/sun4i_tcon.c+9 -00 replies
20/24arm64: dts: allwinner: h616: add display engine, bus and mixer nodesarch/arm64/boot/dts/allwinner/sun50i-h616.dtsi+59 -00 replies
21/24arm64: dts: allwinner: h616: Add TCON nodes to H616 DTSIarch/arm64/boot/dts/allwinner/sun50i-h616.dtsi+139 -00 replies
22/24arm64: dts: allwinner: h616: add LCD and LVDS pinsarch/arm64/boot/dts/allwinner/sun50i-h616.dtsi+26 -00 replies
23/24arm64: dts: allwinner: rg35xx: Add GPIO backlight controlarch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-2024.dts+6 -02 replies
24/24arm64: dts: allwinner: rg35xx: Enable LCD outputarch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-2024.dts+59 -00 replies

Reviews trailers per patch

5 of 24 patches have a Reviewed-by or Acked-by.

PatchAndre PrzywaraConor DooleyChen-Yu Tsai
1/24R-b
2/24R-b
3/24R-b
4/24R-b
5/24
6/24
7/24
8/24A-b R-b
9/24
10/24
11/24
12/24
13/24
14/24
15/24
16/24
17/24
18/24
19/24
20/24
21/24
22/24
23/24
24/24

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v9 thread

Cover letter [PATCH V9 00/24] drm: sun4i: add Display Engine 3.3 (DE33) support

From: Chris Morgan <[email protected]>

I've spoken with Ryan and he agreed to let me take over this series to get the display engine working on the Allwinner H616. I've taken his previous patch series for Display Engine 3.3 and combined it with the LCD controller patch series. I've also fixed a few additional bugs and made some changes to the device tree bindings.

Changes since V8:
- Combined the DE33 [1] series and the LCD [2] series to better track all patches necessary to output to an LCD display for the Allwinner H700.
- Added a required LVDS reset as requested here [3].
- Added compatible strings with a fallback for allwinner,sun50i-h616-display-engine, allwinner,sun50i-h616-tcon-top, and allwinner,sun50i-h616-sram-c.
- Added binding documentation for the LCD controller.
- Renamed the de3_sram device tree node to de33_sram.
- Corrected the LVDS reset for the LCD controller binding.
- Removed the PWM pins from the pincontroller bindings, as PWM is not yet supported.
- Reordered the patches so that a binding or a device tree node is not referenced before it is defined.

[1] https://lore.kernel.org/linux-sunxi/[email protected]/
[2] https://lore.kernel.org/linux-sunxi/[email protected]/
[3] https://lore.kernel.org/linux-sunxi/38669808.XM6RcZxFsP@jernej-laptop/

Chris Morgan (24):
dt-bindings: clock: sun50i-h616-ccu: Add LVDS reset
clk: sunxi-ng: h616: Add LVDS reset for LCD TCON
drm: sun4i: de2/de3: add mixer version enum
drm: sun4i: de2/de3: refactor mixer initialisation
drm: sun4i: de2/de3: add generic blender register reference function
drm: sun4i: de2/de3: use generic register reference function for layer
configuration
dt-bindings: allwinner: add H616 DE33 bus binding
dt-bindings: allwinner: add H616 DE33 clock binding
dt-bindings: allwinner: add H616 DE33 mixer binding
clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support
drm: sun4i: de33: vi_scaler: add Display Engine 3.3 (DE33) support
drm: sun4i: de33: mixer: add Display Engine 3.3 (DE33) support
drm: sun4i: de33: mixer: add mixer configuration for the H616
dt-bindings: allwinner: Add TCON_TOP and TCON_LCD clock/reset defines
dt-bindings: display: sun4i: Add compatible strings for H616 DE
dt-bindings: display: sun4i: Add compatible strings for H616 TCON TOP
dt-bindings: sram: sunxi-sram: Add H616 SRAM C compatible
dt-bindings: display: Add R40 and H616 display engine compatibles drm/sun4i: tcon: Add support for R40 LCD
arm64: dts: allwinner: h616: add display engine, bus and mixer nodes
arm64: dts: allwinner: h616: Add TCON nodes to H616 DTSI
arm64: dts: allwinner: h616: add LCD and LVDS pins
arm64: dts: allwinner: rg35xx: Add GPIO backlight control
arm64: dts: allwinner: rg35xx: Enable LCD output

 .../bus/allwinner,sun50i-a64-de2.yaml         |   7 +-
 .../clock/allwinner,sun8i-a83t-de2-clk.yaml   |   1 +
 .../allwinner,sun4i-a10-display-engine.yaml   |  39 +--
 .../display/allwinner,sun4i-a10-tcon.yaml     |  10 +
 .../allwinner,sun8i-a83t-de2-mixer.yaml       |  34 ++-
 .../display/allwinner,sun8i-r40-tcon-top.yaml |  13 +-
 .../allwinner,sun4i-a10-system-control.yaml   |   4 +-
 .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 224 ++++++++++++++++++
 .../sun50i-h700-anbernic-rg35xx-2024.dts      |  64 +++++
 drivers/clk/sunxi-ng/ccu-sun50i-h616.c        |   1 +
 drivers/clk/sunxi-ng/ccu-sun8i-de2.c          |  25 ++
 drivers/gpu/drm/sun4i/sun4i_tcon.c            |   9 +
 drivers/gpu/drm/sun4i/sun8i_csc.c             |   4 +-
 drivers/gpu/drm/sun4i/sun8i_mixer.c           | 168 ++++++++++---
 drivers/gpu/drm/sun4i/sun8i_mixer.h           |  30 ++-
 drivers/gpu/drm/sun4i/sun8i_ui_layer.c        |  27 ++-
 drivers/gpu/drm/sun4i/sun8i_ui_scaler.c       |   2 +-
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c        |  14 +-
 drivers/gpu/drm/sun4i/sun8i_vi_scaler.c       |   6 +-
 include/dt-bindings/clock/sun8i-tcon-top.h    |   2 +
 include/dt-bindings/reset/sun50i-h616-ccu.h   |   1 +
 21 files changed, 597 insertions(+), 88 deletions(-)
Signature · 1 line
2.43.0