Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:12:14 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_pci.c
src/sys/external/bsd/drm2/i915drm: i915_pci.c
src/sys/external/bsd/drm2/nouveau: nouveau_pci.c
src/sys/external/bsd/drm2/radeon: radeon_pci.c
Log Message:
Call linux_pci_dev_destroy on detach.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/i915drm/i915_pci.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/radeon/radeon_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/amdgpu/amdgpu_pci.c
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.3 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.4
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.3 Mon Aug 27 14:11:46 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Mon Aug 27 14:12:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_pci.c,v 1.3 2018/08/27 14:11:46 riastradh Exp $ */
+/* $NetBSD: amdgpu_pci.c,v 1.4 2018/08/27 14:12:14 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.3 2018/08/27 14:11:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.4 2018/08/27 14:12:14 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -219,7 +219,8 @@ amdgpu_detach(device_t self, int flags)
return error;
sc->sc_drm_dev = NULL;
-out: pmf_device_deregister(self);
+out: linux_pci_dev_destroy(&sc->sc_pci_dev);
+ pmf_device_deregister(self);
return 0;
}
Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.19 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.20
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.19 Mon Aug 27 14:11:46 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Mon Aug 27 14:12:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.19 2018/08/27 14:11:46 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.20 2018/08/27 14:12:14 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.19 2018/08/27 14:11:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.20 2018/08/27 14:12:14 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -231,7 +231,8 @@ i915drmkms_detach(device_t self, int fla
return error;
sc->sc_drm_dev = NULL;
-out: pmf_device_deregister(self);
+out: linux_pci_dev_destroy(&sc->sc_pci_dev);
+ pmf_device_deregister(self);
return 0;
}
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.17 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.18
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.17 Mon Aug 27 14:11:46 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Mon Aug 27 14:12:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.17 2018/08/27 14:11:46 riastradh Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.18 2018/08/27 14:12:14 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.17 2018/08/27 14:11:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.18 2018/08/27 14:12:14 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -217,7 +217,8 @@ nouveau_pci_detach(device_t self, int fl
sc->sc_drm_dev = NULL;
out1: nvkm_device_del(&sc->sc_nv_dev);
-out0: pmf_device_deregister(self);
+out0: linux_pci_dev_destroy(&sc->sc_pci_dev);
+ pmf_device_deregister(self);
return 0;
}
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.12 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.13
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.12 Mon Aug 27 14:11:46 2018
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Mon Aug 27 14:12:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.12 2018/08/27 14:11:46 riastradh Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.13 2018/08/27 14:12:14 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.12 2018/08/27 14:11:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.13 2018/08/27 14:12:14 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -291,7 +291,8 @@ radeon_detach(device_t self, int flags)
return error;
sc->sc_drm_dev = NULL;
-out: pmf_device_deregister(self);
+out: linux_pci_dev_destroy(&sc->sc_pci_dev);
+ pmf_device_deregister(self);
return 0;
}
