diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
|---|---|---|
| committer | John Doe <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
| commit | a7e6ca62ad0d9c3c45fd9e1d81b59c2db2d714cf (patch) | |
| tree | 8f757eeaa2c234af14ca1df515de7810e770ed91 /linux-core/drm_irq.c | |
| parent | a7dc4d08b9b4f8fe6fcaa4c778f6dd3718d1e36a (diff) | |
| parent | 9f19e79f955281b9de393219e4ad9835ffe29c49 (diff) | |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'linux-core/drm_irq.c')
| -rw-r--r-- | linux-core/drm_irq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index 637f5e1d..6b740b18 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -306,6 +306,8 @@ int drm_control(struct drm_device *dev, void *data, case DRM_INST_HANDLER: if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) return 0; + if (drm_core_check_feature(dev, DRIVER_MODESET)) + return 0; if (dev->if_version < DRM_IF_VERSION(1, 2) && ctl->irq != dev->irq) return -EINVAL; @@ -313,6 +315,8 @@ int drm_control(struct drm_device *dev, void *data, case DRM_UNINST_HANDLER: if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) return 0; + if (drm_core_check_feature(dev, DRIVER_MODESET)) + return 0; return drm_irq_uninstall(dev); default: return -EINVAL; |