Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:32:26 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_irq.c
Log Message:
Convert drm_irq.c to use drm_bus irq_install/irq_uninstall.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7 \
src/sys/external/bsd/drm2/dist/drm/drm_irq.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/dist/drm/drm_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.1.1.1.2.6 src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.1.1.1.2.7
--- src/sys/external/bsd/drm2/dist/drm/drm_irq.c:1.1.1.1.2.6 Wed Jul 24 02:31:40 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_irq.c Wed Jul 24 02:32:26 2013
@@ -371,8 +371,13 @@ int drm_irq_install(struct drm_device *d
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 @@ int drm_irq_install(struct drm_device *d
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 @@ int drm_irq_uninstall(struct drm_device
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;
}
