aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c5
-rw-r--r--include/drm/drmP.h1
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 bb6e5a37efa2..5fe50343de11 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,
2443 BUG_ON(!list_empty(&dev_priv->mm.request_list)); 2443 BUG_ON(!list_empty(&dev_priv->mm.request_list));
2444 dev_priv->mm.suspended = 0; 2444 dev_priv->mm.suspended = 0;
2445 mutex_unlock(&dev->struct_mutex); 2445 mutex_unlock(&dev->struct_mutex);
2446
2447 drm_irq_install(dev);
2448
2446 return 0; 2449 return 0;
2447} 2450}
2448 2451
@@ -2458,6 +2461,8 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
2458 i915_gem_cleanup_ringbuffer(dev); 2461 i915_gem_cleanup_ringbuffer(dev);
2459 mutex_unlock(&dev->struct_mutex); 2462 mutex_unlock(&dev->struct_mutex);
2460 2463
2464 drm_irq_uninstall(dev);
2465
2461 return 0; 2466 return 0;
2462} 2467}
2463 2468
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 1469a1bd8821..51ee72c962b1 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,
1134extern int drm_control(struct drm_device *dev, void *data, 1134extern int drm_control(struct drm_device *dev, void *data,
1135 struct drm_file *file_priv); 1135 struct drm_file *file_priv);
1136extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); 1136extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
1137extern int drm_irq_install(struct drm_device *dev);
1137extern int drm_irq_uninstall(struct drm_device *dev); 1138extern int drm_irq_uninstall(struct drm_device *dev);
1138extern void drm_driver_irq_preinstall(struct drm_device *dev); 1139extern void drm_driver_irq_preinstall(struct drm_device *dev);
1139extern void drm_driver_irq_postinstall(struct drm_device *dev); 1140extern void drm_driver_irq_postinstall(struct drm_device *dev);