drm/nouveau: re-jig fbcon suspend/resume process a little

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index ffde896b1f3cc370e7cdbee2812bdc2b9a2e109e..cb357ab3670c23bf1e5ce7a5b709257f1d534b92 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -180,8 +180,8 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
 
        drm_kms_helper_poll_disable(dev);
 
-       NV_INFO(dev, "Disabling fbcon acceleration...\n");
-       nouveau_fbcon_save_disable_accel(dev);
+       NV_INFO(dev, "Disabling fbcon...\n");
+       nouveau_fbcon_set_suspend(dev, 1);
 
        NV_INFO(dev, "Unpinning framebuffer(s)...\n");
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -248,10 +248,6 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
                pci_set_power_state(pdev, PCI_D3hot);
        }
 
-       console_lock();
-       nouveau_fbcon_set_suspend(dev, 1);
-       console_unlock();
-       nouveau_fbcon_restore_accel(dev);
        return 0;
 
 out_abort:
@@ -277,8 +273,6 @@ nouveau_pci_resume(struct pci_dev *pdev)
        if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
                return 0;
 
-       nouveau_fbcon_save_disable_accel(dev);
-
        NV_INFO(dev, "We're back, enabling device...\n");
        pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
@@ -360,7 +354,11 @@ nouveau_pci_resume(struct pci_dev *pdev)
                        NV_ERROR(dev, "Could not pin/map cursor.\n");
        }
 
+       nouveau_fbcon_set_suspend(dev, 0);
+       nouveau_fbcon_zfill_all(dev);
+
        engine->display.init(dev);
+       drm_kms_helper_poll_enable(dev);
 
        /* Force CLUT to get re-loaded during modeset */
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -369,12 +367,6 @@ nouveau_pci_resume(struct pci_dev *pdev)
                nv_crtc->lut.depth = 0;
        }
 
-       console_lock();
-       nouveau_fbcon_set_suspend(dev, 0);
-       console_unlock();
-
-       nouveau_fbcon_zfill_all(dev);
-
        drm_helper_resume_force_mode(dev);
 
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -386,8 +378,6 @@ nouveau_pci_resume(struct pci_dev *pdev)
                                                 nv_crtc->cursor_saved_y);
        }
 
-       nouveau_fbcon_restore_accel(dev);
-       drm_kms_helper_poll_enable(dev);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index dbb151834121c831a6a03975d7b37e1e2966cd64..9892218d7452b0deaa48ef03c46fb7bbecf9b372 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/screen_info.h>
 #include <linux/vga_switcheroo.h>
+#include <linux/console.h>
 
 #include "drmP.h"
 #include "drm.h"
@@ -548,7 +549,13 @@ void nouveau_fbcon_restore_accel(struct drm_device *dev)
 void nouveau_fbcon_set_suspend(struct drm_device *dev, int state)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+       console_lock();
+       if (state == 0)
+               nouveau_fbcon_save_disable_accel(dev);
        fb_set_suspend(dev_priv->nfbdev->helper.fbdev, state);
+       if (state == 1)
+               nouveau_fbcon_restore_accel(dev);
+       console_unlock();
 }
 
 void nouveau_fbcon_zfill_all(struct drm_device *dev)