diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-18 19:48:34 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-18 19:48:34 -0400 |
| commit | b7ae5056c94a8191c1fd0b5697707377516c0c5d (patch) | |
| tree | 394f68003ea0bc2a0c24e510a7c5b13f479ce743 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 2126d0a4a205e2d6b763434f892524cd60f74228 (diff) | |
| parent | 6a2a11dbea5db417d200d38dda53c30a2e5603e0 (diff) | |
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
Conflicts:
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/ttm/ttm_bo.c
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 726c3736082f..251987307ebe 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -2063,6 +2063,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 2063 | dev_priv->mchdev_lock = &mchdev_lock; | 2063 | dev_priv->mchdev_lock = &mchdev_lock; |
| 2064 | spin_unlock(&mchdev_lock); | 2064 | spin_unlock(&mchdev_lock); |
| 2065 | 2065 | ||
| 2066 | /* XXX Prevent module unload due to memory corruption bugs. */ | ||
| 2067 | __module_get(THIS_MODULE); | ||
| 2068 | |||
| 2066 | return 0; | 2069 | return 0; |
| 2067 | 2070 | ||
| 2068 | out_workqueue_free: | 2071 | out_workqueue_free: |