Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2 Call linux_pci_dev_destroy on detach.



details:   https://anonhg.NetBSD.org/src/rev/1e9cc72211dd
branches:  trunk
changeset: 366242:1e9cc72211dd
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 14:12:14 2018 +0000

description:
Call linux_pci_dev_destroy on detach.

diffstat:

 sys/external/bsd/drm2/amdgpu/amdgpu_pci.c   |  7 ++++---
 sys/external/bsd/drm2/i915drm/i915_pci.c    |  7 ++++---
 sys/external/bsd/drm2/nouveau/nouveau_pci.c |  7 ++++---
 sys/external/bsd/drm2/radeon/radeon_pci.c   |  7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diffs (112 lines):

diff -r d37924ff1732 -r 1e9cc72211dd sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
--- a/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Mon Aug 27 14:12:00 2018 +0000
+++ b/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Mon Aug 27 14:12:14 2018 +0000
@@ -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 @@
                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;
 }
diff -r d37924ff1732 -r 1e9cc72211dd sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c  Mon Aug 27 14:12:00 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c  Mon Aug 27 14:12:14 2018 +0000
@@ -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 @@
                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;
 }
 
diff -r d37924ff1732 -r 1e9cc72211dd sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Aug 27 14:12:00 2018 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Mon Aug 27 14:12:14 2018 +0000
@@ -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 @@
        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;
 }
 
diff -r d37924ff1732 -r 1e9cc72211dd sys/external/bsd/drm2/radeon/radeon_pci.c
--- a/sys/external/bsd/drm2/radeon/radeon_pci.c Mon Aug 27 14:12:00 2018 +0000
+++ b/sys/external/bsd/drm2/radeon/radeon_pci.c Mon Aug 27 14:12:14 2018 +0000
@@ -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 @@
                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;
 }



Home | Main Index | Thread Index | Old Index