diff options
Diffstat (limited to 'meta/packages/linux/linux-moblin-2.6.27-rc6/0018-i915-gem-install-and-uninstall-irq-handler-in-enter.patch')
-rw-r--r-- | meta/packages/linux/linux-moblin-2.6.27-rc6/0018-i915-gem-install-and-uninstall-irq-handler-in-enter.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/packages/linux/linux-moblin-2.6.27-rc6/0018-i915-gem-install-and-uninstall-irq-handler-in-enter.patch b/meta/packages/linux/linux-moblin-2.6.27-rc6/0018-i915-gem-install-and-uninstall-irq-handler-in-enter.patch deleted file mode 100644 index 3593fa5826..0000000000 --- a/meta/packages/linux/linux-moblin-2.6.27-rc6/0018-i915-gem-install-and-uninstall-irq-handler-in-enter.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | commit 7ad6d5861b04bbb2cdc36d1dcf8989e16f86e659 | ||
2 | Author: Kristian Høgsberg <krh@redhat.com> | ||
3 | Date: Wed Aug 20 11:04:27 2008 -0400 | ||
4 | |||
5 | i915 gem: install and uninstall irq handler in entervt and leavevt ioctls. | ||
6 | |||
7 | Signed-off-by: Kristian Høgsberg <krh@redhat.com> | ||
8 | Signed-off-by: Eric Anholt <eric@anholt.net> | ||
9 | |||
10 | diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c | ||
11 | index bb6e5a3..5fe5034 100644 | ||
12 | --- a/drivers/gpu/drm/i915/i915_gem.c | ||
13 | +++ b/drivers/gpu/drm/i915/i915_gem.c | ||
14 | @@ -2443,6 +2443,9 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, | ||
15 | BUG_ON(!list_empty(&dev_priv->mm.request_list)); | ||
16 | dev_priv->mm.suspended = 0; | ||
17 | mutex_unlock(&dev->struct_mutex); | ||
18 | + | ||
19 | + drm_irq_install(dev); | ||
20 | + | ||
21 | return 0; | ||
22 | } | ||
23 | |||
24 | @@ -2458,6 +2461,8 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data, | ||
25 | i915_gem_cleanup_ringbuffer(dev); | ||
26 | mutex_unlock(&dev->struct_mutex); | ||
27 | |||
28 | + drm_irq_uninstall(dev); | ||
29 | + | ||
30 | return 0; | ||
31 | } | ||
32 | |||
33 | diff --git a/include/drm/drmP.h b/include/drm/drmP.h | ||
34 | index 1469a1b..51ee72c 100644 | ||
35 | --- a/include/drm/drmP.h | ||
36 | +++ b/include/drm/drmP.h | ||
37 | @@ -1134,6 +1134,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev, | ||
38 | extern int drm_control(struct drm_device *dev, void *data, | ||
39 | struct drm_file *file_priv); | ||
40 | extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); | ||
41 | +extern int drm_irq_install(struct drm_device *dev); | ||
42 | extern int drm_irq_uninstall(struct drm_device *dev); | ||
43 | extern void drm_driver_irq_preinstall(struct drm_device *dev); | ||
44 | extern void drm_driver_irq_postinstall(struct drm_device *dev); | ||