瀏覽代碼

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>
Kristian Høgsberg 16 年之前
父節點
當前提交
dbb19d302b
共有 2 個文件被更改,包括 6 次插入0 次删除
  1. 5 0
      drivers/gpu/drm/i915/i915_gem.c
  2. 1 0
      include/drm/drmP.h

+ 5 - 0
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));
 	BUG_ON(!list_empty(&dev_priv->mm.request_list));
 	dev_priv->mm.suspended = 0;
 	dev_priv->mm.suspended = 0;
 	mutex_unlock(&dev->struct_mutex);
 	mutex_unlock(&dev->struct_mutex);
+
+	drm_irq_install(dev);
+
 	return 0;
 	return 0;
 }
 }
 
 
@@ -2458,6 +2461,8 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
 		i915_gem_cleanup_ringbuffer(dev);
 		i915_gem_cleanup_ringbuffer(dev);
 	mutex_unlock(&dev->struct_mutex);
 	mutex_unlock(&dev->struct_mutex);
 
 
+	drm_irq_uninstall(dev);
+
 	return 0;
 	return 0;
 }
 }
 
 

+ 1 - 0
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,
 extern int drm_control(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 		       struct drm_file *file_priv);
 extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
 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 int drm_irq_uninstall(struct drm_device *dev);
 extern void drm_driver_irq_preinstall(struct drm_device *dev);
 extern void drm_driver_irq_preinstall(struct drm_device *dev);
 extern void drm_driver_irq_postinstall(struct drm_device *dev);
 extern void drm_driver_irq_postinstall(struct drm_device *dev);