fix(drm): no VRR-off retry loop while switched away

commit: c821b809446578518246a10a20af5098fc19ebfd
author: brice · 27d ago · 2026-09-25 18:04 UTC
parent: 19dda7c
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +4 -2

M internal/adapters/drm/output.go +4 -2


@@ -295,14 +295,16 @@ func (o *Output) Run(ctx context.Context, newRenderer func(w, h int) (ports.Rend
295	295		}
296	296		// A composed screen that stopped changing still drops VRR on time.
297	297		var vrrOff <-chan time.Time
298		-	if o.vrrOn && !o.composedSince.IsZero() {
	298	+	if enabled && o.vrrOn && !o.composedSince.IsZero() {
299	299		vrrOff = time.After(max(0, vrrHold-time.Since(o.composedSince)))
300	300		}
301	301		select {
302	302		case <-retry:
303	303		continue
304	304		case <-vrrOff:
305		-	o.setVRR(false)
	305	+	if o.setVRR(false); o.vrrOn {
	306	+	o.composedSince = time.Now() // failed: retry later, not in a loop
	307	+	}
306	308		continue
307	309		case <-ctx.Done():
308	310		return nil

 		}
 		// A composed screen that stopped changing still drops VRR on time.
 		var vrrOff <-chan time.Time
-		if o.vrrOn && !o.composedSince.IsZero() {
+		if enabled && o.vrrOn && !o.composedSince.IsZero() {
 			vrrOff = time.After(max(0, vrrHold-time.Since(o.composedSince)))
 		}
 		select {
 		case <-retry:
 			continue
 		case <-vrrOff:
-			o.setVRR(false)
+			if o.setVRR(false); o.vrrOn {
+				o.composedSince = time.Now() // failed: retry later, not in a loop
+			}
 			continue
 		case <-ctx.Done():
 			return nil