From 88411149231f755affa176a8c1792c396fcf9dec Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Sat, 6 Apr 2013 00:15:21 +0200 Subject: [PATCH] --- yaml --- r: 371430 b: refs/heads/master c: 8ba8209fefb67edf2ecbb92e9f16008bfaa1b031 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/power.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 547ce508908c..1f8ec10082be 100644 --- 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 index 889b854751da..4c575a9a9c81 100644 --- 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); }