From 7b721a835fc3ba2e92fb62739a92ef05a78ead45 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 9 Nov 2011 14:31:16 +1000 Subject: [PATCH] --- yaml --- r: 282623 b: refs/heads/master c: cf41d53bf5b95d77673b185cc3b20ae3257f79e2 h: refs/heads/master i: 282621: a4da2d95ef2d5688c53911df23b3706c5bf71ea7 282619: 54bd915c6e5d58a26092eb8c2f1ad4944e26003a 282615: 12e43568cb3f3b7e337ad84a2b9a229676ed5ab7 282607: fb65e9f2f648e53602e5d4d34b9a1686daed8c85 282591: 770a13c44c55d57982f3c08be447b572cb44c10c 282559: 6f9c30233f4ad589081c1607edd0823c2a7d5b97 282495: d5d2e7af1eb8e428b6b1f2d463bff33135eff116 282367: 77eaa2ac6484ab57bc2cebe05108de6e583bd6a3 282111: 05dd57cec601ed812620788549383399b9bb9efb 281599: 76c2e7f48708891db2f81abd0b3e8e7ccd2b4169 280575: cd71a68d22357df1cd89122de4b852a9f825e274 278527: 60182f3596b168f0a8302e7ae396a910783dc901 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 22 +++++-------------- trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 7 ++++++ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index c48f9355ed03..315dd675a11e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a44e4997c5fee8e1da1589ff57e0bd1c53f03ce +refs/heads/master: cf41d53bf5b95d77673b185cc3b20ae3257f79e2 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c index ffde896b1f3c..cb357ab3670c 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/trunk/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/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c index dbb151834121..9892218d7452 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -36,6 +36,7 @@ #include #include #include +#include #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)