# HG changeset patch
# User Taylor R Campbell <riastradh@NetBSD.org>
# Date 1590350832 0
#      Sun May 24 20:07:12 2020 +0000
# Branch trunk
# Node ID b34068ebdd07b7886f206350be60a9a3cc51f67b
# Parent  6eaf2ec050e21c0e4f594782cc03cc550db6fd3c
Release kernel lock during drm attach.

But reacquire it around config_found since autoconf still wants it.

diff -r 6eaf2ec050e2 -r b34068ebdd07 sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c	Fri May 22 20:27:16 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c	Sun May 24 20:07:12 2020 +0000
@@ -253,7 +253,9 @@ static int intelfb_create(struct drm_fb_
 	 * XXX Should do this asynchronously, since we hold
 	 * dev->struct_mutex.
 	 */
+	KERNEL_LOCK(1, NULL);
 	helper->fbdev = config_found_ia(dev->dev, "intelfbbus", &ifa, NULL);
+	KERNEL_UNLOCK_ONE(NULL);
 	if (helper->fbdev == NULL) {
 		DRM_ERROR("unable to attach intelfb\n");
 		ret = -ENXIO;
diff -r 6eaf2ec050e2 -r b34068ebdd07 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c	Fri May 22 20:27:16 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c	Sun May 24 20:07:12 2020 +0000
@@ -442,8 +442,10 @@ nouveau_fbcon_create(struct drm_fb_helpe
 	nfa.nfa_fb_ptr = nvbo_kmap_obj_iovirtual(nvbo);
 	nfa.nfa_fb_linebytes = mode_cmd.pitches[0];
 
+	KERNEL_LOCK(1, NULL);
 	helper->fbdev = config_found_ia(dev->dev, "nouveaufbbus", &nfa,
 	    nouveau_fbcon_print);
+	KERNEL_UNLOCK_ONE(NULL);
 	if (helper->fbdev == NULL) {
 		goto out_unlock;
 	}
diff -r 6eaf2ec050e2 -r b34068ebdd07 sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c	Fri May 22 20:27:16 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c	Sun May 24 20:07:12 2020 +0000
@@ -253,8 +253,10 @@ static int radeonfb_create(struct drm_fb
 	rfa.rfa_fb_ptr = rbo->kptr;
 	rfa.rfa_fb_linebytes = mode_cmd.pitches[0];
 
+	KERNEL_LOCK(1, NULL);
 	helper->fbdev = config_found_ia(rdev->ddev->dev, "radeonfbbus", &rfa,
 	    NULL);
+	KERNEL_UNLOCK_ONE(NULL);
 	if (helper->fbdev == NULL) {
 		DRM_ERROR("failed to attach genfb\n");
 		goto out_unref;
diff -r 6eaf2ec050e2 -r b34068ebdd07 sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c	Fri May 22 20:27:16 2020 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c	Sun May 24 20:07:12 2020 +0000
@@ -167,10 +167,13 @@ i915drmkms_attach_real(device_t self)
 	const struct intel_device_info *const info = i915drmkms_pci_lookup(pa);
 	const unsigned long cookie =
 	    (unsigned long)(uintptr_t)(const void *)info;
+	int biglocks;
 	int error;
 
 	KASSERT(info != NULL);
 
+	KERNEL_UNLOCK_ALL(NULL, &biglocks);
+
 	sc->sc_task_state = I915DRMKMS_TASK_ATTACH;
 	SIMPLEQ_INIT(&sc->sc_task_u.attach);
 
@@ -182,7 +185,7 @@ i915drmkms_attach_real(device_t self)
 	    cookie, &sc->sc_drm_dev);
 	if (error) {
 		aprint_error_dev(self, "unable to attach drm: %d\n", error);
-		return;
+		goto out;
 	}
 
 	while (!SIMPLEQ_EMPTY(&sc->sc_task_u.attach)) {
@@ -200,8 +203,10 @@ i915drmkms_attach_real(device_t self)
 		aprint_error_dev(self, "unable to create workqueue: %d\n",
 		    error);
 		sc->sc_task_u.workqueue = NULL;
-		return;
+		goto out;
 	}
+
+out:	KERNEL_LOCK(biglocks, NULL);
 }
 
 static int
diff -r 6eaf2ec050e2 -r b34068ebdd07 sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c	Fri May 22 20:27:16 2020 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c	Sun May 24 20:07:12 2020 +0000
@@ -181,8 +181,11 @@ nouveau_pci_attach_real(device_t self)
 {
 	struct nouveau_pci_softc *const sc = device_private(self);
 	const struct pci_attach_args *const pa = &sc->sc_pa;
+	int biglocks;
 	int error;
 
+	KERNEL_UNLOCK_ALL(NULL, &biglocks);
+
 	sc->sc_dev = self;
 	sc->sc_task_state = NOUVEAU_TASK_ATTACH;
 	SIMPLEQ_INIT(&sc->sc_task_u.attach);
@@ -198,7 +201,7 @@ nouveau_pci_attach_real(device_t self)
 	if (error) {
 		aprint_error_dev(self, "unable to create nouveau device: %d\n",
 		    error);
-		return;
+		goto out;
 	}
 
 	/* XXX errno Linux->NetBSD */
@@ -206,7 +209,7 @@ nouveau_pci_attach_real(device_t self)
 	    nouveau_drm_driver_pci, 0, &sc->sc_drm_dev);
 	if (error) {
 		aprint_error_dev(self, "unable to attach drm: %d\n", error);
-		return;
+		goto out;
 	}
 
 	while (!SIMPLEQ_EMPTY(&sc->sc_task_u.attach)) {
@@ -224,8 +227,10 @@ nouveau_pci_attach_real(device_t self)
 		aprint_error_dev(self, "unable to create workqueue: %d\n",
 		    error);
 		sc->sc_task_u.workqueue = NULL;
-		return;
+		goto out;
 	}
+
+out:	KERNEL_LOCK(biglocks, NULL);
 }
 
 static int
diff -r 6eaf2ec050e2 -r b34068ebdd07 sys/external/bsd/drm2/radeon/radeon_pci.c
--- a/sys/external/bsd/drm2/radeon/radeon_pci.c	Fri May 22 20:27:16 2020 +0000
+++ b/sys/external/bsd/drm2/radeon/radeon_pci.c	Sun May 24 20:07:12 2020 +0000
@@ -227,8 +227,11 @@ radeon_attach_real(device_t self)
 	const struct pci_attach_args *const pa = &sc->sc_pa;
 	bool ok __diagused;
 	unsigned long flags;
+	int biglocks;
 	int error;
 
+	KERNEL_UNLOCK_ALL(NULL, &biglocks);
+
 	ok = radeon_pci_lookup(pa, &flags);
 	KASSERT(ok);
 
@@ -274,6 +277,7 @@ radeon_attach_real(device_t self)
 	}
 
 out:	sc->sc_dev = self;
+	KERNEL_LOCK(biglocks, NULL);
 }
 
 static int