From 6e75e84a40a12b766a26b036e127139a3a27ec83 Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Sun, 21 Feb 2010 13:28:35 +0100 Subject: [PATCH] --- yaml --- r: 189307 b: refs/heads/master c: 81441570c9cbf453891d90f5725adbbfe5a9cc69 h: refs/heads/master i: 189305: ef6e16528fd9a41e8ec32d5f95f91955cac1d4ed 189303: ccd02aa4888332bfb1bd966a3d4dbe0f91c8a25f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 151cce2b27ab..b4927d9eb136 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5ec882cfc18007c6076236ac33a713bcc1d35aa +refs/heads/master: 81441570c9cbf453891d90f5725adbbfe5a9cc69 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c index f7f28f2f8641..0f7e2d069302 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -158,9 +158,11 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) if (pm_state.event == PM_EVENT_PRETHAW) return 0; + NV_INFO(dev, "Disabling fbcon acceleration...\n"); fbdev_flags = dev_priv->fbdev_info->flags; dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED; + NV_INFO(dev, "Unpinning framebuffer(s)...\n"); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { struct nouveau_framebuffer *nouveau_fb;