---

yaml --- r: 371430 b: refs/heads/master c: 8ba8209 h: refs/heads/master v: v3
git-mirror · Apr 7, 2013 · 8841114 · 8841114
1 parent ceca3eb
commit 8841114
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 070839ea54bfb65f328d0aaaf99aa5b3b1273286
+refs/heads/master: 8ba8209fefb67edf2ecbb92e9f16008bfaa1b031
diff --git a/trunk/drivers/gpu/drm/gma500/power.c b/trunk/drivers/gpu/drm/gma500/power.c
@@ -110,6 +110,8 @@ static void gma_resume_display(struct pci_dev *pdev)
 	PSB_WVDC32(dev_priv->pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);
 	pci_write_config_word(pdev, PSB_GMCH_CTRL,
 			dev_priv->gmch_ctrl | _PSB_GMCH_ENABLED);
+
+	psb_gtt_restore(dev); /* Rebuild our GTT mappings */
 	dev_priv->ops->restore_regs(dev);
 }