Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 189307
b: refs/heads/master
c: 8144157
h: refs/heads/master
i:
  189305: ef6e165
  189303: ccd02aa
v: v3
  • Loading branch information
Maarten Maathuis authored and Ben Skeggs committed Mar 10, 2010
1 parent 1dc9136 commit 6e75e84
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e5ec882cfc18007c6076236ac33a713bcc1d35aa
refs/heads/master: 81441570c9cbf453891d90f5725adbbfe5a9cc69
2 changes: 2 additions & 0 deletions trunk/drivers/gpu/drm/nouveau/nouveau_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 6e75e84

Please sign in to comment.