kernel: M4 VOP display driver ported to 6.18 — binds on hardware (connector WIP)
The RV1106 VOP is the RV-series "lite" VOP (rockchip,rv1106-vop, VOP_VERSION 2.0xc),
mainline's VOP1 driver. Its sibling rv1126 is already in 6.18, so rv1106_vop reuses
rv1126's register sub-structs + VOP_FEATURE_INTERNAL_RGB + the smaller raster.
Verified on warden-c8a3: with the driver delta + DT (vop enabled with named
"ahb"/"dclk" resets, vop_out repointed to a panel-dpi 720x720 node, pwm-backlight
on pwm1), the VOP BINDS and DRM initialises (/dev/dri/card0), and the PWM backlight
comes up. The register data / version / feature / resets are validated.
Open: /sys/class/drm/card0 has no connector yet — rockchip_rgb_init isn't producing
one ("Cannot find any crtc"). Last mile of M4; needs a debug print in rgb_init + the
panel bus_format, and the pixels must be verified on the physical panel (can't be
checked over serial/ssh). Full recipe + next steps in display/README.md.
Also batch-2 config: GPIO_SYSFS, PWM_ROCKCHIP, crypto (aes/ccm/ctr/arc4), CFG80211,
DRM_ROCKCHIP/ROCKCHIP_VOP all =y; PSCI-style SMC removed via the psci-node deletion.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017wB8KB3MMQztRDXCMCkPrf
This commit is contained in:
BFE Engineering
co-authored by
Claude Opus 4.8
Claude Opus 4.8
parent
79ef2df67a
commit
5abf1c4468
@@ -28,9 +28,11 @@ c8a3, not just compiled.
|
||||
| USB host (xhci, usb1) | xhci-hcd:usb1 | mainline | ⬜ M6 |
|
||||
| crypto (aes/ccm/ctr/arc4) | modules | mainline | ⬜ batch2 (config =y) |
|
||||
| PSCI node (removed) | — | — | ✅ deleted (no secure monitor → SMC fault) |
|
||||
| VOP display (ff990000) | ff990000.vop | rockchip DRM | ⬜ M4 |
|
||||
| RGB666 720×720 panel + backlight | — | panel-simple/rockchip | ⬜ M4 |
|
||||
| GT911 touch (goodix) | goodix, gt911 | mainline | ⬜ M4 |
|
||||
| VOP display (ff990000) | ff990000.vop | ported (rv1126 sibling) | 🔨 binds+DRM+card0; connector WIP |
|
||||
| PWM backlight (pwm1) | — | mainline (rk3328 fallback) | ✅ backlight up (brightness) |
|
||||
| RGB666 720×720 panel | — | panel-dpi | 🔨 probes; bus_format + connector WIP |
|
||||
| GT911 touch (goodix) | goodix, gt911 | mainline | ⬜ M4 (needs GPIO_SYSFS ✅ + node) |
|
||||
| GPIO_SYSFS / crypto / CFG80211 | — | mainline (config) | ✅ =y (batch2) |
|
||||
| AIC8800 wifi (bsp/fdrv) | aic8800_* | **out-of-tree** | ⬜ M5 |
|
||||
| AIC8800 BT (btlpm) | aic8800_btlpm | **out-of-tree** | ⬜ M5 |
|
||||
| NPU (rknpu, ff660000) | rknpu, ff660000.npu | **out-of-tree** | ⬜ M6 |
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
# M4 — display (VOP) port to 6.18
|
||||
|
||||
The RV1106 VOP is the older RV-series "lite" VOP (`rockchip,rv1106-vop`, VOP_VERSION
|
||||
2.0xc), driven by mainline's `rockchip_drm_vop.c` (VOP1), **not** VOP2. Its sibling
|
||||
**rv1126** is already in mainline 6.18, so the register data is a small reuse — like
|
||||
the clk/pinctrl ports.
|
||||
|
||||
## The driver delta (`rockchip_vop_reg.c`)
|
||||
|
||||
`rv1106_vop_data.c.frag` — add this `vop_data` (reuses rv1126's common/modeset/
|
||||
output/misc/intr/win sub-structs; only the version, the smaller 1280² raster, and
|
||||
the **`VOP_FEATURE_INTERNAL_RGB` feature** differ), plus the match entry:
|
||||
|
||||
```c
|
||||
{ .compatible = "rockchip,rv1106-vop", .data = &rv1106_vop },
|
||||
```
|
||||
|
||||
`VOP_FEATURE_INTERNAL_RGB` is essential — it is what makes `vop_bind` call
|
||||
`rockchip_rgb_init()` for the parallel-RGB output (rv1126 routes through MIPI and
|
||||
omits it).
|
||||
|
||||
## The DT (in `../dts/rv1106-warden.dts`)
|
||||
|
||||
- `&vop` enabled + **named resets** `resets = <&cru SRST_H_VOP>, <&cru SRST_D_VOP>;
|
||||
reset-names = "ahb", "dclk";` — the mainline driver requires these (the vendor
|
||||
node omits them; without them: `vop_bind: failed to get ahb reset`).
|
||||
- `&vop_out_rgb` repointed straight to the panel (mainline has no separate rgb
|
||||
node — `rockchip_rgb_init` is a helper the VOP calls).
|
||||
- `panel` (`panel-dpi`, 720×720, 30 MHz) + `pwm-backlight` on `&pwm1`.
|
||||
|
||||
## Verified on warden-c8a3 (2026-08-24)
|
||||
|
||||
`CONFIG_DRM_ROCKCHIP=y` + `CONFIG_ROCKCHIP_VOP=y`. On hardware:
|
||||
```
|
||||
rockchip-drm display-subsystem: bound ff990000.vop
|
||||
[drm] Initialized rockchip 1.0.0 for display-subsystem on minor 0
|
||||
```
|
||||
`/dev/dri/card0` is present and the **PWM backlight is up** (`/sys/class/backlight`,
|
||||
brightness settable). **The VOP driver port is validated** — the register data,
|
||||
version, feature, and resets are right.
|
||||
|
||||
## Open (needs on-panel eyes + a little more debug)
|
||||
|
||||
`/sys/class/drm/card0-*` has **no connector yet** — `rockchip_rgb_init` isn't
|
||||
producing one (log: `Cannot find any crtc or sizes`), despite INTERNAL_RGB set and
|
||||
a clean vop→panel of_graph. Likely a panel-probe-order / `drm_of_find_panel_or_bridge`
|
||||
detail. This is the last mile of M4 and, unlike the driver bind, needs the panel
|
||||
physically observed (pixels can't be verified over serial/ssh). To pin it down: a
|
||||
debug print in `rockchip_rgb_init` (child_count / find-panel ret), and set the panel
|
||||
bus_format to `MEDIA_BUS_FMT_RGB666_1X18` (a small `panel_dpi_probe` addition, since
|
||||
mainline panel-dpi doesn't read bus-format from DT).
|
||||
@@ -0,0 +1,17 @@
|
||||
* RV1106 VOP: the same RV-series "lite" VOP as rv1126 (VOP_VERSION 2.0xc vs
|
||||
* 2.0xb), so it reuses rv1126's register sub-structs. Only the version and the
|
||||
* smaller max raster differ. Ported for the WardenOS 86-Panel (720x720 RGB).
|
||||
*/
|
||||
static const struct vop_data rv1106_vop = {
|
||||
.version = VOP_VERSION(2, 0xc),
|
||||
.feature = VOP_FEATURE_INTERNAL_RGB, /* RV1106 drives a parallel-RGB panel */
|
||||
.intr = &px30_intr,
|
||||
.common = &rv1126_common,
|
||||
.modeset = &rv1126_modeset,
|
||||
.output = &rv1126_output,
|
||||
.misc = &rv1126_misc,
|
||||
.win = rv1126_vop_win_data,
|
||||
.win_size = ARRAY_SIZE(rv1126_vop_win_data),
|
||||
.max_output = { 1280, 1280 },
|
||||
.lut_size = 1024,
|
||||
};
|
||||
@@ -59,3 +59,72 @@
|
||||
&wdt {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/* --- M4: display (VOP + RGB → 720x720 panel + PWM backlight) --- */
|
||||
&display_subsystem {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&vop {
|
||||
status = "okay";
|
||||
/* mainline rockchip_drm_vop requests named "ahb" + "dclk" resets that the
|
||||
* vendor node omits; without them vop_bind fails "failed to get ahb reset". */
|
||||
resets = <&cru SRST_H_VOP>, <&cru SRST_D_VOP>;
|
||||
reset-names = "ahb", "dclk";
|
||||
};
|
||||
|
||||
/* mainline wires vop_out straight to the panel (no separate rgb node) */
|
||||
&vop_out_rgb {
|
||||
remote-endpoint = <&panel_in_vop>;
|
||||
};
|
||||
|
||||
&pwm1 {
|
||||
status = "okay";
|
||||
pinctrl-names = "active";
|
||||
pinctrl-0 = <&pwm1m2_pins>;
|
||||
};
|
||||
|
||||
/ {
|
||||
backlight: backlight {
|
||||
compatible = "pwm-backlight";
|
||||
pwms = <&pwm1 0 100000 50000>;
|
||||
brightness-levels = <0 32 64 96 128 160 192 224 255>;
|
||||
default-brightness-level = <8>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
panel: panel {
|
||||
compatible = "panel-dpi";
|
||||
backlight = <&backlight>;
|
||||
width-mm = <85>;
|
||||
height-mm = <85>;
|
||||
|
||||
panel-timing {
|
||||
clock-frequency = <30000000>;
|
||||
hactive = <720>;
|
||||
vactive = <720>;
|
||||
hback-porch = <44>;
|
||||
hfront-porch = <46>;
|
||||
vback-porch = <18>;
|
||||
vfront-porch = <16>;
|
||||
hsync-len = <2>;
|
||||
vsync-len = <2>;
|
||||
hsync-active = <0>;
|
||||
vsync-active = <0>;
|
||||
de-active = <0>;
|
||||
pixelclk-active = <0>;
|
||||
};
|
||||
|
||||
port {
|
||||
panel_in_vop: endpoint {
|
||||
remote-endpoint = <&vop_out_rgb>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/* the vendor rgb bridge node has no 6.18 driver and its dangling endpoint
|
||||
* corrupts the vop->panel of_graph; disable it so the graph is clean. */
|
||||
&rgb {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user