From 62a6f88abd3c8643bb93c16d1e8ca6f67f643864 Mon Sep 17 00:00:00 2001 From: "Claude (noether)" Date: Sat, 16 May 2026 06:07:39 +0000 Subject: [PATCH] fleet/ampere: pin baseline to torvalds v7.0-rc3 (working) instead of broken marfrit tip MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2026-05-16 bisect found that linux-rk3588-marfrit @ f8f3ad9 (the previous baseline.ref) black-screens ampere — eDP connector reports connected/enabled/dpms On + SDDM starts + backlight on, but the panel shows no pixels. Decomposing the suspend/resume patch 0010 into 5 atomic sub-commits and reverting all of them did NOT recover display, ruling out 0010 as the offender. The 6 patches already listed in fleet/ampere.yaml's includes apply cleanly on top of v7.0-rc3 mainline and produce a kernel that boots with working display + power-off. That's the verified-working baseline, captured here. Regression source is in one of the 12 remaining commits f8f3ad9 has on top of v7.0-rc3. Top suspect: 55d1b3dcc05e "clk: rockchip: rk3588: Drop CLK_SET_RATE_PARENT from DCLK_VOP2_SRC" (touches display controller clock parent rate). Bisect campaign separately. For consumers who want a ready-to-fetch ref instead of patches-on-mainline, the verified-working tree is on git.reauktion.de/marfrit/linux-rk3588-marfrit @ ampere-minimal-devices (7c241f2e2835). No change to the includes list — same 6 patches as #8, just retargeted to a baseline they can actually be applied to. Generated-by: Claude Opus 4.7 --- fleet/ampere.yaml | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/fleet/ampere.yaml b/fleet/ampere.yaml index f492c0d..cb38b56 100644 --- a/fleet/ampere.yaml +++ b/fleet/ampere.yaml @@ -17,11 +17,30 @@ board: coolpi-cm5-genbook distro: archlinux-arm baseline: - tree: marfrit/linux-rockchip - branch: linux-rk3588-marfrit - ref: f8f3ad934433bd7e1207d9b0b37e817a692b7ee9 # 2026-05-15 tip - upstream_compat: linux-7.0-rc3 # commits sit on top of v7.0-rc3 + 18 RK3588 deltas - base_path: boltzmann:~/src/linux-rockchip # the working tree + tree: torvalds/linux + url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + ref: v7.0-rc3 + upstream_compat: linux-7.0-rc3 + +# 2026-05-16 bisect note: the linux-rk3588-marfrit branch tip @ f8f3ad9 +# (18 commits ahead of v7.0-rc3) BLACK-SCREENS ampere — connector +# reports connected/enabled/dpms On + SDDM starts + backlight on, but +# panel shows no pixels. Decomposing the suspend/resume patch (0010 +# family) into 5 atomic sub-commits and reverting all 5 did NOT recover +# display (test-arch-plus-pcie3 branch). The 6 patches listed below +# applied on top of v7.0-rc3 directly DO boot with working display +# (ampere-minimal-devices branch @ 7c241f2). Regression source is in +# one of the remaining 12 commits in f8f3ad9 — top suspect: +# 55d1b3dcc05e "clk: rockchip: rk3588: Drop CLK_SET_RATE_PARENT from +# DCLK_VOP2_SRC" (touches display controller clock parent rate). Other +# excluded commits: Shawn Lin pcie3 phy series, Cristian Ciocaltea +# clk/dts/dw-dp fixes, Sebastian Reichel hdmirx Rock 5 ITX, Pedro Alves +# btrtl, and the suspend/resume patch 0010 family. Bisect campaign +# separately. +# +# Branch ampere-minimal-devices on git.reauktion.de/marfrit/linux-rk3588-marfrit +# is the verified-working tip if you want a ready-to-fetch ref instead +# of patches-on-mainline. # Scope-tagged patch includes. Resolve to patches//.patch. # Apply order matters: pwm15 pinctrl (soc) must precede the genbook -- 2.47.3