diff options
| author | Jesse Barnes | 2010-03-26 19:07:21 +0100 |
|---|---|---|
| committer | Eric Anholt | 2010-05-07 22:59:30 +0200 |
| commit | 3d8620cc5f8538364ee152811e2bd8713abb1d58 (patch) | |
| tree | b0e209e85ecb9fbd5afbce60e85cc5211fb1c86b /drivers/gpu | |
| parent | drm/i915: Make fbc control wrapper functions (diff) | |
| download | kernel-qcow2-linux-3d8620cc5f8538364ee152811e2bd8713abb1d58.tar.gz kernel-qcow2-linux-3d8620cc5f8538364ee152811e2bd8713abb1d58.tar.xz kernel-qcow2-linux-3d8620cc5f8538364ee152811e2bd8713abb1d58.zip | |
drm/i915: cleanup mode setting before unmapping registers
We'll turn off outputs etc at unload time, so don't unmap the registers
before doing it.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 03d1d3a1a6c1..bf7d601fc37d 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1758,6 +1758,8 @@ int i915_driver_unload(struct drm_device *dev) } if (drm_core_check_feature(dev, DRIVER_MODESET)) { + intel_modeset_cleanup(dev); + /* * free the memory space allocated for the child device * config parsed from VBT @@ -1781,8 +1783,6 @@ int i915_driver_unload(struct drm_device *dev) intel_opregion_free(dev, 0); if (drm_core_check_feature(dev, DRIVER_MODESET)) { - intel_modeset_cleanup(dev); - i915_gem_free_all_phys_object(dev); mutex_lock(&dev->struct_mutex); |