Source-Changes-HG archive

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

[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm Convert drm_irq.c to...



details:   https://anonhg.NetBSD.org/src/rev/fcf83ec5344b
branches:  riastradh-drm2
changeset: 788168:fcf83ec5344b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:32:26 2013 +0000

description:
Convert drm_irq.c to use drm_bus irq_install/irq_uninstall.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_irq.c |  13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diffs (41 lines):

diff -r 2aadcc3dafc0 -r fcf83ec5344b sys/external/bsd/drm2/dist/drm/drm_irq.c
--- a/sys/external/bsd/drm2/dist/drm/drm_irq.c  Wed Jul 24 02:32:10 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_irq.c  Wed Jul 24 02:32:26 2013 +0000
@@ -371,8 +371,13 @@
        else
                irqname = dev->driver->name;
 
+#ifdef __NetBSD__
+       ret = (*dev->driver->bus->irq_install)(dev, dev->driver->irq_handler,
+           sh_flags, irqname, dev, &dev->irq_cookie);
+#else
        ret = request_irq(drm_dev_to_irq(dev), dev->driver->irq_handler,
                          sh_flags, irqname, dev);
+#endif
 
        if (ret < 0) {
                mutex_lock(&dev->struct_mutex);
@@ -394,7 +399,11 @@
                mutex_unlock(&dev->struct_mutex);
                if (!drm_core_check_feature(dev, DRIVER_MODESET))
                        vga_client_register(dev->pdev, NULL, NULL, NULL);
+#ifdef __NetBSD__
+               (*dev->driver->bus->irq_uninstall)(dev, dev->irq_cookie);
+#else
                free_irq(drm_dev_to_irq(dev), dev);
+#endif
        }
 
        return ret;
@@ -451,7 +460,11 @@
        if (dev->driver->irq_uninstall)
                dev->driver->irq_uninstall(dev);
 
+#ifdef __NetBSD__
+       (*dev->driver->bus->irq_uninstall)(dev, dev->irq_cookie);
+#else
        free_irq(drm_dev_to_irq(dev), dev);
+#endif
 
        return 0;
 }



Home | Main Index | Thread Index | Old Index