[PATCH] DRM / radeon / PM: Do not evict VRAM during freeze phase of hibernation

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rjw at sisk.pl>

I have recently noticed a 55 sec. delay during the "device freeze"
phase of hibernation on my test-bed HP nx6325.  Due to the 100%
reproducibility of it I was able to narrow it down to
radeon_suspend_kms() and then it turned out that the delay occured
somewhere in radeon_bo_evict_vram().  However, it doesn't seem really
necessary or even very useful to me to evict VRAM at this particular
point, because we're going to create an image and bring the device
back to the fully functional state in a little while.  Thus, I think
the VRAM evicition can be skipped for state.event == PM_EVENT_FREEZE,
which makes the delay go away.

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
---
 drivers/gpu/drm/radeon/radeon_device.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/gpu/drm/radeon/radeon_device.c
===================================================================
--- linux-2.6.orig/drivers/gpu/drm/radeon/radeon_device.c
+++ linux-2.6/drivers/gpu/drm/radeon/radeon_device.c
@@ -750,8 +750,11 @@ int radeon_suspend_kms(struct drm_device
 			}
 		}
 	}
-	/* evict vram memory */
-	radeon_bo_evict_vram(rdev);
+
+	if (state.event != PM_EVENT_FREEZE) {
+		/* evict vram memory */
+		radeon_bo_evict_vram(rdev);
+	}
 	/* wait for gpu to finish processing current batch */
 	radeon_fence_wait_last(rdev);