skip to content

detached bb97d3a

fix(drm): close the overlay acquire fence when rendering fails and skip cancelled sync waits

commit: bb97d3abcffabbb907af8d6b69e96621259c3db6
author: brice · 26d ago · 2026-09-26 12:33 UTC
parent: a30b85b
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +5 -0

M internal/adapters/drm/output.go +1 -0


@@ -831,6 +831,7 @@ func (o *Output) Run(ctx context.Context, newRenderer func(w, h int) (ports.Rend
831	831		r.UseTarget(o.back)
832	832		done, rerr := r.Render(composed, surfaces)
833	833		if rerr != nil {
	834	+	ov.close()
834	835		return fmt.Errorf("render frame: %w", rerr)
835	836		}
836	837		if ov.fb != 0 && !o.testOverlay(o.fbs[o.back], ov) {


@@ -831,6 +831,7 @@ func (o *Output) Run(ctx context.Context, newRenderer func(w, h int) (ports.Rend
831		r.UseTarget(o.back)	831		r.UseTarget(o.back)
832		done, rerr := r.Render(composed, surfaces)	832		done, rerr := r.Render(composed, surfaces)
833		if rerr != nil {	833		if rerr != nil {
			834	+	ov.close()
834		return fmt.Errorf("render frame: %w", rerr)	835		return fmt.Errorf("render frame: %w", rerr)
835		}	836		}
836		if ov.fb != 0 && !o.testOverlay(o.fbs[o.back], ov) {	837		if ov.fb != 0 && !o.testOverlay(o.fbs[o.back], ov) {

M internal/adapters/wayland/syncobj.go +4 -0


@@ -290,6 +290,10 @@ func (sw *syncWaiter) run(ctx context.Context) {
290	290		fired := false
291	291		kept := waits[:0]
292	292		for i, w := range waits {
	293	+	if w.cancelled.Load() {
	294	+	unix.Close(w.efd)
	295	+	continue
	296	+	}
293	297		if fds[i+1].Revents == 0 {
294	298		kept = append(kept, w)
295	299		continue


@@ -290,6 +290,10 @@ func (sw *syncWaiter) run(ctx context.Context) {
290		fired := false	290		fired := false
291		kept := waits[:0]	291		kept := waits[:0]
292		for i, w := range waits {	292		for i, w := range waits {
			293	+	if w.cancelled.Load() {
			294	+	unix.Close(w.efd)
			295	+	continue
			296	+	}
293		if fds[i+1].Revents == 0 {	297		if fds[i+1].Revents == 0 {
294		kept = append(kept, w)	298		kept = append(kept, w)
295		continue	299		continue