1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 1de974acbc65..c6079e36669d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -153,7 +153,6 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
         struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
         struct nouveau_channel *chan;
         struct drm_crtc *crtc;
-        uint32_t fbdev_flags;
         int ret, i;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
@@ -163,8 +162,7 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
                 return 0;
 
         NV_INFO(dev, "Disabling fbcon acceleration...\n");
-        fbdev_flags = dev_priv->fbdev_info->flags;
-        dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
+        nouveau_fbcon_save_disable_accel(dev);
 
         NV_INFO(dev, "Unpinning framebuffer(s)...\n");
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -230,9 +228,9 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
         }
 
         acquire_console_sem();
-        fb_set_suspend(dev_priv->fbdev_info, 1);
+        nouveau_fbcon_set_suspend(dev, 1);
         release_console_sem();
-        dev_priv->fbdev_info->flags = fbdev_flags;
+        nouveau_fbcon_restore_accel(dev);
         return 0;
 
 out_abort:
@@ -250,14 +248,12 @@ nouveau_pci_resume(struct pci_dev *pdev)
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_engine *engine = &dev_priv->engine;
         struct drm_crtc *crtc;
-        uint32_t fbdev_flags;
         int ret, i;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 return -ENODEV;
 
-        fbdev_flags = dev_priv->fbdev_info->flags;
-        dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
+        nouveau_fbcon_save_disable_accel(dev);
 
         NV_INFO(dev, "We're back, enabling device...\n");
         pci_set_power_state(pdev, PCI_D0);
@@ -332,13 +328,14 @@ nouveau_pci_resume(struct pci_dev *pdev)
         }
 
         acquire_console_sem();
-        fb_set_suspend(dev_priv->fbdev_info, 0);
+        nouveau_fbcon_set_suspend(dev, 0);
         release_console_sem();
 
-        nouveau_fbcon_zfill(dev);
+        nouveau_fbcon_zfill_all(dev);
 
         drm_helper_resume_force_mode(dev);
-        dev_priv->fbdev_info->flags = fbdev_flags;
+
+        nouveau_fbcon_restore_accel(dev);
         return 0;
 }