diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 20:46:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 20:46:45 +0200 |
| commit | b43f9b59e65e1d4ff06474885b44515817868fdd (patch) | |
| tree | 0de0ca983a6624b0582034154da4d17a170caf1e /drivers/gpu/drm/radeon/si.c | |
| parent | staging: sync: Add compat_ioctl handlers to sync drivers (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-b43f9b59e65e1d4ff06474885b44515817868fdd.tar.xz linux-b43f9b59e65e1d4ff06474885b44515817868fdd.zip | |
Merge 3.9-rc5 into staging-next
This pulls in all of the good fixes we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 9128120da044..bafbe3216952 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -4469,6 +4469,7 @@ int si_resume(struct radeon_device *rdev) int si_suspend(struct radeon_device *rdev) { + radeon_vm_manager_fini(rdev); si_cp_enable(rdev, false); cayman_dma_stop(rdev); si_irq_suspend(rdev); |