[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc _nouve...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e9e5505b826
branches:  trunk
changeset: 811245:9e9e5505b826
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 18 14:05:58 2015 +0000

description:
_nouveau_mc_dtor: only pci_intr_disestablish if the device is pci

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc/nouveau_subdev_mc_base.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 99a56ce83f5f -r 9e9e5505b826 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc/nouveau_subdev_mc_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc/nouveau_subdev_mc_base.c    Sun Oct 18 14:04:32 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc/nouveau_subdev_mc_base.c    Sun Oct 18 14:05:58 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_subdev_mc_base.c,v 1.3 2015/03/06 13:44:18 riastradh Exp $     */
+/*     $NetBSD: nouveau_subdev_mc_base.c,v 1.4 2015/10/18 14:05:58 jmcneill Exp $      */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_mc_base.c,v 1.3 2015/03/06 13:44:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_mc_base.c,v 1.4 2015/10/18 14:05:58 jmcneill Exp $");
 
 #include <subdev/mc.h>
 #include <core/option.h>
@@ -107,8 +107,10 @@
 {
        struct nouveau_device *device = nv_device(object);
        struct nouveau_mc *pmc = (void *)object;
-#ifdef __NetBSD__
-       pci_intr_disestablish(device->pdev->pd_pa.pa_pc, pmc->irq_cookie);
+#ifdef __NetBSD__              /* XXX nouveau platform */
+       if (nv_device_is_pci(device)) {
+               pci_intr_disestablish(device->pdev->pd_pa.pa_pc, pmc->irq_cookie);
+       }
 #else
        free_irq(pmc->irq, pmc);
 #endif