On Mon, Sep 28, 2026 at 10:04:56AM +0200, [email protected] wrote:
> Le Mon, Sep 28, 2026 at 05:22:15PM +1000, Jonathan Gray a écrit :
> > On Mon, Sep 28, 2026 at 04:56:10PM +1000, Jonathan Gray wrote:
> > > On Mon, Sep 28, 2026 at 08:09:34AM +0200, [email protected] wrote:
> > > > hi
> > > >
> > > > upgraded my work t470s this morning to latest snap (previously running a
> > > > snap from the 6), first noticed that wsconsctl during boot was stuck on
> > > > ww_mutex_lock (^T showed it making no progress) and the laptop lid was
> > > > 'flashing' every ~10s or so.
> > > >
> > > > moved my wsconsctl.conf away, X wouldnt start anyway (Xorg.0.log
> > > > attached)
> > > >
> > > > bisected previous kernels from the archive:
> > > > #56: Fri Sep 25 11:32:45 MDT 2026 is bad
> > > > #55: Wed Sep 23 14:37:23 MDT 2026 is good (eg screen wont flash during
> > > > boot msgs and X starts)
> > >
> > > Likely the sleep changes. Does this diff to revert them help?
> >
> > alternatively, avoid sleep when cold
>
> sadly, this version doesnt work (eg screen still flashes after switching
> to kms, and X wont start)
a version that keeps the previous midpoint behaviour
while still using tsleep
Index: sys/dev/pci/drm/include/linux/delay.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/include/linux/delay.h,v
diff -u -p -r1.9 delay.h
--- sys/dev/pci/drm/include/linux/delay.h 25 Sep 2026 12:12:53 -0000
1.9
+++ sys/dev/pci/drm/include/linux/delay.h 28 Sep 2026 08:17:35 -0000
@@ -21,7 +21,8 @@ ndelay(unsigned long nsecs)
static inline void
usleep_range(unsigned long min, unsigned long max)
{
- tsleep_nsec(&nowake, PWAIT, "usleep", USEC_TO_NSEC(min));
+ unsigned long usecs = min + (max - min) / 2;
+ tsleep_nsec(&nowake, PWAIT, "usleep", USEC_TO_NSEC(usecs));
}
/* XXX assumes state is TASK_UNINTERRUPTIBLE */
