Hi Linus, On Sat, Sep 18, 2021 at 8:24 PM Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > On Sat, Sep 18, 2021 at 2:18 AM Michael Stapelberg > <michael@xxxxxxxxxxxxx> wrote: > > > > torvalds at linux-foundation.org (Linus Torvalds) writes: > > > Did I fix it up correctly? Who knows. The code makes more sense to me > > > now and seems valid. But I really *really* want to stress how locking > > > is important. > > > > As far as I can tell, this merge conflict resolution made my Raspberry > > Pi 3 hang on boot. > > Ok, that's a different merge issue than the locking one (which is > about the amd ttm code). > > But the VC4 driver did have changes close to each other in the hdmi > detection and clock setting code. > > And it doesn't seem to be just RPi3, there was a report back a couple > of weeks ago about RPi4 also having regressed (with an Ubuntu > install). That one was an oops in vc4_hdmi_audio_prepare(). I don't > know if that got resolved, I heard nothing about it after the report. Its still there. I am seeing it every night. This was from last night - https://lava.qa.codethink.co.uk/scheduler/job/164#L1356 Last night's test was on top of 4357f03d6611 ("Merge tag 'pm-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") -- Regards Sudip
