From: jsg <jsg@openbsd.org>
Date: Fri, 2 Feb 2024 03:07:10 +0000 (+0000)
Subject: drm: Don't unref the same fb many times by mistake due to deadlock handling
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4e56c6a23d3a8bad543ff9f652cfd14e4e53bbec;p=openbsd

drm: Don't unref the same fb many times by mistake due to deadlock handling

From Ville Syrjala
d7afdf360f4ac142832b098b4de974e867cc063c in linux-6.6.y/6.6.15
cb4daf271302d71a6b9a7c01bd0b6d76febd8f0c in mainline linux
---

diff --git a/sys/dev/pci/drm/drm_plane.c b/sys/dev/pci/drm/drm_plane.c
index 24e7998d173..01fbd3fb7b9 100644
--- a/sys/dev/pci/drm/drm_plane.c
+++ b/sys/dev/pci/drm/drm_plane.c
@@ -1387,6 +1387,7 @@ retry:
 out:
 	if (fb)
 		drm_framebuffer_put(fb);
+	fb = NULL;
 	if (plane->old_fb)
 		drm_framebuffer_put(plane->old_fb);
 	plane->old_fb = NULL;