Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:05:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau_pci.c
Log Message:
nouveau: Call nouveau_drm_device_init.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/nouveau/nouveau_pci.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/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.30 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.31
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.30 Sun Dec 19 11:05:13 2021
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Sun Dec 19 11:05:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.30 2021/12/19 11:05:13 riastradh Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.31 2021/12/19 11:05:20 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.30 2021/12/19 11:05:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.31 2021/12/19 11:05:20 riastradh Exp $");
#ifdef _KERNEL_OPT
#if defined(__arm__) || defined(__aarch64__)
@@ -223,6 +223,13 @@ nouveau_pci_attach_real(device_t self)
sc->sc_pci_attached = true;
/* XXX errno Linux->NetBSD */
+ error = -nouveau_drm_device_init(sc->sc_drm_dev);
+ if (error) {
+ aprint_error_dev(self, "unable to init nouveau: %d\n", error);
+ return;
+ }
+
+ /* XXX errno Linux->NetBSD */
error = -drm_dev_register(sc->sc_drm_dev, 0);
if (error) {
aprint_error_dev(self, "unable to register drm: %d\n", error);
