1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 044bc98fb459..835516d2d257 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1191,14 +1191,12 @@ int radeon_device_init(struct radeon_device *rdev,
         r = radeon_gem_init(rdev);
         if (r)
                 return r;
-        /* initialize vm here */
-        mutex_init(&rdev->vm_manager.lock);
+
         /* Adjust VM size here.
          * Currently set to 4GB ((1 << 20) 4k pages).
          * Max GPUVM size for cayman and SI is 40 bits.
          */
         rdev->vm_manager.max_pfn = 1 << 20;
-        INIT_LIST_HEAD(&rdev->vm_manager.lru_vm);
 
         /* Set asic functions */
         r = radeon_asic_init(rdev);
@@ -1426,7 +1424,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon)
 
         /* unpin the front buffers */
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-                struct radeon_framebuffer *rfb = to_radeon_framebuffer(crtc->fb);
+                struct radeon_framebuffer *rfb = to_radeon_framebuffer(crtc->primary->fb);
                 struct radeon_bo *robj;
 
                 if (rfb == NULL || rfb->obj == NULL) {
@@ -1445,10 +1443,9 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon)
         /* evict vram memory */
         radeon_bo_evict_vram(rdev);
 
-        mutex_lock(&rdev->ring_lock);
         /* wait for gpu to finish processing current batch */
         for (i = 0; i < RADEON_NUM_RINGS; i++) {
-                r = radeon_fence_wait_empty_locked(rdev, i);
+                r = radeon_fence_wait_empty(rdev, i);
                 if (r) {
                         /* delay GPU reset to resume */
                         force_completion = true;
@@ -1457,7 +1454,6 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon)
         if (force_completion) {
                 radeon_fence_driver_force_completion(rdev);
         }
-        mutex_unlock(&rdev->ring_lock);
 
         radeon_save_bios_scratch_regs(rdev);
 
@@ -1555,10 +1551,12 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
         /* reset hpd state */
         radeon_hpd_init(rdev);
         /* blat the mode back in */
-        drm_helper_resume_force_mode(dev);
-        /* turn on display hw */
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
+        if (fbcon) {
+                drm_helper_resume_force_mode(dev);
+                /* turn on display hw */
+                list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+                        drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
+                }
         }
 
         drm_kms_helper_poll_enable(dev);