diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 10:13:00 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 10:14:50 +0200 |
| commit | fb9a90f7c674f3ddef6baf55cb1612dadd8ea752 (patch) | |
| tree | f25cf2ce17449ba34cdfdfb948134eb3464e400e /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: Update hotplug interrupts register definitions for Sandybridge (diff) | |
| parent | drm, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum (diff) | |
| download | linux-fb9a90f7c674f3ddef6baf55cb1612dadd8ea752.tar.xz linux-fb9a90f7c674f3ddef6baf55cb1612dadd8ea752.zip | |
Merge remote branch 'airlied/drm-core-next' into tmp
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 f451af69d437..a99fae33bdf6 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -2065,6 +2065,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) dev_priv->mchdev_lock = &mchdev_lock; spin_unlock(&mchdev_lock); + /* XXX Prevent module unload due to memory corruption bugs. */ + __module_get(THIS_MODULE); + return 0; out_workqueue_free: |