diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-08-20 11:04:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-10-18 07:10:52 +1000 |
| commit | dbb19d302baa8ba518599701914f600935fc53fa (patch) | |
| tree | d3391ed8f7c39f8201d3ea1432df6f634770a2e5 | |
| parent | c99b058f132388a666544d293392d52d1def6b12 (diff) | |
i915 gem: install and uninstall irq handler in entervt and leavevt ioctls.
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 | ||||
| -rw-r--r-- | include/drm/drmP.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index bb6e5a37efa..5fe50343de1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2443,6 +2443,9 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, BUG_ON(!list_empty(&dev_priv->mm.request_list)); dev_priv->mm.suspended = 0; mutex_unlock(&dev->struct_mutex); + + drm_irq_install(dev); + return 0; } @@ -2458,6 +2461,8 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data, i915_gem_cleanup_ringbuffer(dev); mutex_unlock(&dev->struct_mutex); + drm_irq_uninstall(dev); + return 0; } diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 1469a1bd882..51ee72c962b 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1134,6 +1134,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev, extern int drm_control(struct drm_device *dev, void *data, struct drm_file *file_priv); extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); +extern int drm_irq_install(struct drm_device *dev); extern int drm_irq_uninstall(struct drm_device *dev); extern void drm_driver_irq_preinstall(struct drm_device *dev); extern void drm_driver_irq_postinstall(struct drm_device *dev); |