Repository navigation
drm: google: add the Pixel 6 Pro's display (gs101 DECON and DSIM, S6E3HC3 panel) - #116
Conversation
a05e07c to
16cee6a
Compare
|
Thanks, this is a lot of careful work, and good news for raven. I checked the hardware side against Google's Since gs-decon and gs-dsim-cmd run on my Pixel 7 Pro every day, I compared their objects function by function against today's base. Three things need sorting out before merging:
Smaller:
|
|
Smoke report from the build that runs this: #112 (comment). |
|
Thanks for the smoke report, and I see you've made this a draft while you work on it. The three points from my earlier comment still apply to this head (it hasn't changed since), so here's just where things stand around it:
|
16cee6a to
50ddd6e
Compare
|
Reworked along your three points, rebased onto
The smaller ones: the aperture and VT-switch fixes now come before the DT commits, and the LDO22M/BUCKA comment says the rails stay on, since the S6E3HC3 driver doesn't switch them. We know this waits for #88 and #90: it still conflicts with both ( Gate ( Booted on raven as tools/phone-smoke report (Wi-Fi, sound, sensors and the modem units fail or skip: this kernel doesn't build them)phone-smoke: unknownKernel
Packages: hyprland 0.56.2-7, libcamera 0.7.2-4, mesa 1:26.2.4-1.2, omacam 0.1.9-1, omamessages 0.2.0-1, omamobile-apps 0.2.0-1, omamobile-audio 0.4.4-1, omamobile-device-raven 0.1.23.6-1, omamobile-firstboot 0.1.0-1, omamobile-gnss 0.2.1-1, omamobile-keyring 20261013-1, omamobile-mirror 0.1.1-1, omamobile-mmd 0.1.2-1, omamobile-modem 0.1.9-1, omamobile-modem-sit 0.3.57-1, omamobile-omarchy 0.1.1-1, omamobile-owl-widgets 0.1.1-1, omamobile-sensors 0.2.0-1, omamobile-shell 0.2.21-1, omaphone 0.2.0-1, omarchy 4.0.4-2, omatel-agent 0.2.0-1, quickshell 0.3.2.r7.g2b4501a-1 |
|
Thanks for reworking this along all three points, and with a fresh boot and smoke report. It reads much more cleanly now. I went through the new head point by point:
The smaller ones are all done too: the fixes come before the DT commits, the rail comment matches what the driver does, and the booted What's left is the order. This merges after #114 (its three commits are under this one) and after tegu's #88 and #90, and then it needs a rebase. To save you some time, the two conflicts resolve like this:
A few small things you can fold into that rebase if you like:
Thanks again. It'll be good to have raven's display on the published branch. |
fb1bb4f to
c9ca976
Compare
|
Thanks for the careful review, and for spelling out both conflict resolutions. That made the rebase quick. Rebased onto today's
With #88's per-panel DSIM timers, raven's bootloader timers match the Pixel 7 Pro's S6E3HC4 set (the same values the shared table had before), so raven keeps its 60/120 Hz switching with no change here.
I haven't booted this head yet. Since the booted one, the code changes are the merged |
|
Thank you, @robotosaith, and nicely done on the rebase. Both conflicts are resolved exactly as I'd hoped (all three flags in The one thing left before I merge is the raven run. Since the boot you reported, Optional: in |
|
Ran this head on raven today:
The smoke report flags one thing: new dmesg errors, all UFS. They're the published branch's UFS phone-smokephone-smoke: ravenKernel
Packages: hyprland 0.57.0-3.1, libcamera 0.7.2-4.22, mesa 1:26.2.4-1.4, omacam 0.3.3-1, omamessages 0.2.1-1, omamobile-apps 0.2.2-1, omamobile-device-raven 0.1.30-1, omamobile-firstboot 0.1.3-1, omamobile-keyring 20261026-1, omamobile-mirror 0.1.1-1, omamobile-omarchy 0.1.31-1, omamobile-owl-widgets 0.1.2-1, omamobile-shell 0.2.94-1, omamobile-voice 0.1.0-1, omaphone 0.2.2-1, omarchy 4.0.6-1, omatel-agent 0.2.4-2, quickshell 0.3.2.r7.g2b4501a-1 I've left the optional |
|
Thank you, @robotosaith, for the full run. It covers everything I asked for: the release, the "link timers for Our gate passes on today's I'm happy to take the Thanks again for seeing this through so many rounds. It's good to have raven's display on the published branch. |
|
Thanks again, @robotosaith. Before merging I re-ran everything on today's One correction, and it's mine. The sentence I asked you to add to "put MIF back after a 120 Hz stint" is wrong. On the Pixel 7 Pro, MIF isn't at its top level: every gs-decon probe in my logs reads "MIF at 2028000000 Hz", and the firmware's own rate read in my ACPM notes says the same. The conclusion still holds, because 2028 MHz is above the 1352 MHz floor and nothing else votes on MIF there, so nothing is written. But the reason I gave you isn't true, and kernel commits land as they are. Could you swap that paragraph for something like this?
That's the only change. Once it's pushed I'll merge right away. Your |
gs101 (Tensor) has the same DECON and DSIM blocks as gs201 (Google's cal_9845 register layout); only DECON0's address and the interrupt numbers differ. Describe both with gs201's compatible as the fallback. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
gs101's DECON is gs201's (Google's cal_9845 register layout), and it falls back to gs201's compatible. Give "google,gs101-decon" its own match data, gs201's for now, so that behaviour found and tested on the Pixel 6 Pro only can be turned on for gs101 without changing the Pixel 7 Pro. The DSIM needs nothing of its own and matches through the gs201 fallback. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
The S6E3HC3 in the Pixel 6 Pro is the S6E3HC4's predecessor, with the same supplies and reset line. The bootloader leaves it running and its driver takes it over without a reset, so reset-gpios is required only for the S6E3HC4. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
The Pixel 6 Pro's bootloader leaves the S6E3HC3 running in DSI command mode. Take it over as it is, like the S6E3HC4 driver: no reset or rail changes, nothing sent until the backlight changes. Brightness is DCS 0x51 in the normal range 4..2047 (Google's GPL driver). Level 0 is the dimmest level, not off: Omarchy darkens with level 0 before locking and puts the level back afterwards, and when the put-back did not happen the panel stayed dark with nothing to wake it. A blanked backlight turns the display off (0x28, then 20 ms), and the next unblanked update turns it back on. Since a reloaded driver cannot know whether the panel was left with its display off, its first unblanked update sends display on. The refresh rate switches between 60 and 120 Hz with the vendor driver's manual mode: unlock F0, BD 21 (manual), 60 00 for 120 Hz or 60 01 for 60 Hz, F7 0F (frequency update), lock F0. The panel takes the new rate at its next frame without a power cycle; gs-dsim-cmd switches its link timers around it. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
Dropping the 120 Hz floor left MIF at 1352 MHz, screen off included, since nothing else votes on it. Remember the rate at probe and set it back when the floor goes (the CRTC disable drops to 60 Hz first). On the Pixel 7 Pro MIF reads 2028 MHz at probe, above the 1352 MHz floor, and nothing else votes on it, so this costs one ACPM read when leaving 120 Hz and writes nothing there. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
gs-decon evicts simpledrm from the boot framebuffer, but on raven simpledrm probed 30 ms after gs-decon registered, found the aperture free and stayed: Hyprland drove it as a second, invisible monitor (Unknown-1) next to the panel. After the eviction, acquire the range too, so a later simpledrm fails its own acquire with -EBUSY. Only gs101 holds it: it adds a failure path to probe, and the Pixel 7 Pro (gs201) has not shown the race. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
With no fbdev console the suspend VT switch has nothing to show, but it still takes the session away from the compositor: logind deactivates and reactivates it, Hyprland (libseat) drops its input devices and reopens them, and the power-key press that woke the Pixel 6 Pro from s2idle is lost with the old device. Every wake needed a second press. Tell the PM core a VT switch is only needed with the fbdev console, and stop tracking the device on remove. Only on gs101 for now: the Pixel 7 Pro (gs201) runs without fbdev too, and its validated s2idle path keeps its VT switch until this has been tested there. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
DECON0 at 0x1c300000 (frame start/done/extra on SPI 338/337/336), the DPP0 read DMA at 0x1c0b0000 and DSIM0 at 0x1c2c0000 (SPI 345), from Google's gs101-drm-dpu.dtsi, disabled. No power-domains: nothing may power the DPU down under DECON while the bootloader's pipeline runs. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
gs-decon takes the bootloader's pipeline over from simpledrm: DECON0 into DSIM0, with the S6E3HC3 panel for brightness, display on/off and 60/120 Hz. gs-decon also stops the frames with the screen off (screen_off), so the DSIM gets no google,decon phandle. Scanout buffers come from a reusable 92 MiB pool between 2.5 and 3.5 GiB: DPP0 takes 32-bit addresses with the DPU SysMMU bypassed, and its reads from 0xf2c00000 and up hung silently. The framebuffer node holds the panel's vci (LDO22M) and vddi (BUCKA) rails. When gs-decon takes over, simpledrm goes away and releases them; the panel lost power and DECON's first shadow update never completed. Keep both rails on: the S6E3HC3 driver doesn't switch them. Assisted-by: Claude Opus 5.5 Signed-off-by: saiththerobo <the.tom.sharp@gmail.com>
c9ca976 to
78d4ce6
Compare
|
Thanks, and no worries about the MIF sentence. The paragraph is now yours word for word in "drm: google: gs-decon: put MIF back after a 120 Hz stint".
On 78d4ce6, |
|
Thank you, @robotosaith. The paragraph is in, and the rebase over the Tensor G3 display is exactly right: Our gate passes on today's That last one is the only thing between this and the merge, and it's on me, not you. The restore isn't gated, so on my 7 Pro it adds one firmware read of the MIF rate at every drop from 120 Hz, which there means every screen-off. I said earlier I was fine taking that by reading, but our own rule for shared drivers says a change that reaches the 7 Pro runs on it first, and I should hold myself to it. So I'll boot this series on my phone (rates, DPMS, a few sleeps), and merge as soon as that's clean. There's nothing for you to push. Your Thanks for your patience through all of this. |
|
The 7 Pro run is done: published
So on the 7 Pro the restore reads and never writes, as you said. Thank you for waiting for this; it should have been run days ago. Merging. |
Raven's display on Derek's gs-decon/gs-dsim driver: gs101 has gs201's DECON and DSIM register layout, so the work is the SoC's nodes, a panel driver and three gs-decon fixes found on raven.
"google,gs101-decon", "google,gs201-decon"and"google,gs101-dsim", "google,gs201-dsim"; only DECON0's address and the interrupts differ, in the DT. gs-dsim-cmd is unchanged.google,gs101-decongets its own match data, gs201's plus two flags that stay off for gs201:hold_boot_fb: hold the boot framebuffer's aperture after evicting simpledrm, so simpledrm can't probe late and stay as a second output;vt_switch_fbdev_only: no VT switch around system sleep without the fbdev console.gs101.dtsi(disabled), and raven's panel with its rails, which stay on since the panel driver doesn't switch them.Tested on raven as
7.3.0-rc6-omamobile-push1-g5a144ff68cc6(the head before this rebase, plus raven's not-for-merge USB 2 peripheral override): gs-decon and the panel driver take over from the bootloader, one output (DSI-1), 60 Hz at probe and 120 Hz from the shell, DPMS off and on, no flip timeouts with the backlight at 0, and three s2idle cycles each woken by one Power press. The smoke report is in the thread.tools/kernel-pr-check --build --mergepasses:W=1builds clean, nine device trees with no newdtbs_checkwarnings, anddt_binding_checkon the three bindings. The gs201, zuma and zumapro DTBs are byte-identical to the base; the Pixel 6 and 6a gain only the two disabled nodes fromgs101.dtsi. checkpatch--strictis clean: the trailers areAssisted-by: Claude Opus 5.5now, and the panel driver has a MAINTAINERS entry.🤖 Generated with Claude Code