From d73a9e10f78cd643cb8e165ca6bbef58b5436f51 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Sun, 9 Oct 2011 22:58:33 +0200 Subject: [PATCH] --- yaml --- r: 282579 b: refs/heads/master c: 4bfb94a1b40e694284df3ea7dfb66ce6252b6008 h: refs/heads/master i: 282577: 140a442cff2dab3291eb92f870a3ffe5d537557a 282575: d753606d8cc42a811fc444870619806b6ae2625d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 193946657140..4fb10960b2f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c983e6f660dd39758b032a2de4c8844ff2575278 +refs/heads/master: 4bfb94a1b40e694284df3ea7dfb66ce6252b6008 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c index f0a60afac446..982505b1be58 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -178,6 +178,8 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0; + drm_kms_helper_poll_disable(dev); + NV_INFO(dev, "Disabling fbcon acceleration...\n"); nouveau_fbcon_save_disable_accel(dev); @@ -385,6 +387,7 @@ nouveau_pci_resume(struct pci_dev *pdev) drm_helper_resume_force_mode(dev); nouveau_fbcon_restore_accel(dev); + drm_kms_helper_poll_enable(dev); return 0; }