Module Name: src
Committed By: chs
Date: Mon Dec 20 20:34:59 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_fb.c
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_fbdev.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_fbcon.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c
src/sys/external/bsd/drm2/drm: drmfb.c
Log Message:
drm: add missing KERNEL_LOCK around calls to config_found().
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drmfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.10 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c:1.10 Sun Dec 19 12:02:39 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fb.c Mon Dec 20 20:34:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_fb.c,v 1.10 2021/12/19 12:02:39 riastradh Exp $ */
+/* $NetBSD: amdgpu_fb.c,v 1.11 2021/12/20 20:34:58 chs Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.10 2021/12/19 12:02:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fb.c,v 1.11 2021/12/20 20:34:58 chs Exp $");
#include <linux/module.h>
#include <linux/pm_runtime.h>
@@ -274,8 +274,10 @@ static int amdgpufb_create(struct drm_fb
afa.afa_fb_ptr = amdgpu_bo_kptr(abo);
afa.afa_fb_linebytes = mode_cmd.pitches[0];
+ KERNEL_LOCK(1, NULL);
helper->fbdev = config_found(adev->ddev->dev, &afa, NULL,
CFARGS(.iattr = "amdgpufbbus"));
+ KERNEL_UNLOCK_ONE(NULL);
if (helper->fbdev == NULL) {
DRM_ERROR("failed to attach amdgpufb\n");
goto out;
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c:1.9 Sun Dec 19 12:32:15 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_fbdev.c Mon Dec 20 20:34:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_fbdev.c,v 1.9 2021/12/19 12:32:15 riastradh Exp $ */
+/* $NetBSD: intel_fbdev.c,v 1.10 2021/12/20 20:34:58 chs Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.9 2021/12/19 12:32:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.10 2021/12/20 20:34:58 chs Exp $");
#include <linux/async.h>
#include <linux/console.h>
@@ -264,8 +264,10 @@ 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(dev->dev, &ifa, NULL,
CFARGS(.iattr = "intelfbbus"));
+ KERNEL_UNLOCK_ONE(NULL);
if (helper->fbdev == NULL) {
DRM_ERROR("unable to attach intelfb\n");
ret = -ENXIO;
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.15 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c:1.15 Sun Dec 19 11:34:44 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c Mon Dec 20 20:34:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_fbcon.c,v 1.15 2021/12/19 11:34:44 riastradh Exp $ */
+/* $NetBSD: nouveau_fbcon.c,v 1.16 2021/12/20 20:34:58 chs Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.15 2021/12/19 11:34:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fbcon.c,v 1.16 2021/12/20 20:34:58 chs Exp $");
#include <linux/module.h>
#include <linux/kernel.h>
@@ -420,8 +420,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(dev->dev, &nfa, nouveau_fbcon_print,
CFARGS(.iattr = "nouveaufbbus"));
+ KERNEL_UNLOCK_ONE(NULL);
if (helper->fbdev == NULL) {
goto out_unlock;
}
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.14 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.14 Sun Dec 19 10:46:44 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Mon Dec 20 20:34:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_fb.c,v 1.14 2021/12/19 10:46:44 riastradh Exp $ */
+/* $NetBSD: radeon_fb.c,v 1.15 2021/12/20 20:34:58 chs Exp $ */
/*
* Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.14 2021/12/19 10:46:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.15 2021/12/20 20:34:58 chs Exp $");
#include <linux/module.h>
#include <linux/pci.h>
@@ -275,8 +275,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(rdev->ddev->dev, &rfa, NULL,
CFARGS(.iattr = "radeonfbbus"));
+ KERNEL_UNLOCK_ONE(NULL);
if (helper->fbdev == NULL) {
DRM_ERROR("failed to attach genfb\n");
goto out;
Index: src/sys/external/bsd/drm2/drm/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.11 src/sys/external/bsd/drm2/drm/drmfb.c:1.12
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.11 Mon Dec 20 00:27:53 2021
+++ src/sys/external/bsd/drm2/drm/drmfb.c Mon Dec 20 20:34:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.11 2021/12/20 00:27:53 riastradh Exp $ */
+/* $NetBSD: drmfb.c,v 1.12 2021/12/20 20:34:59 chs Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.11 2021/12/20 00:27:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.12 2021/12/20 20:34:59 chs Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -156,7 +156,9 @@ drmfb_attach(struct drmfb_softc *sc, con
genfb_ops.genfb_enable_polling = drmfb_genfb_enable_polling;
genfb_ops.genfb_disable_polling = drmfb_genfb_disable_polling;
+ KERNEL_LOCK(1, NULL);
error = genfb_attach(&sc->sc_genfb, &genfb_ops);
+ KERNEL_UNLOCK_ONE(NULL);
if (error) {
aprint_error_dev(sc->sc_da.da_dev,
"failed to attach genfb: %d\n", error);
