Merge tag 'v3.10-rc2' into drm-intel-next-queued

Backmerge Linux 3.10-rc2 since the various (rather trivial) conflicts
grew a bit out of hand. intel_dp.c has the only real functional
conflict since the logic changed while dev_priv->edp.bpp was moved
around.

Also squash in a whitespace fixup from Ben Widawsky for
i915_gem_gtt.c, git seems to do something pretty strange in there
(which I don't fully understand tbh).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_dp.c

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 17 insertions, 0 deletions

diff --git a/drivers/gpu/drm/gma500/power.c b/drivers/gpu/drm/gma500/power.c
index 889b854751da..b6b135fcd59c 100644
--- a/drivers/gpu/drm/gma500/power.c
+++ b/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);
 }
 
@@ -313,3 +315,18 @@ int psb_runtime_idle(struct device *dev)
         else
                 return 1;
 }
+
+int gma_power_thaw(struct device *_dev)
+{
+        return gma_power_resume(_dev);
+}
+
+int gma_power_freeze(struct device *_dev)
+{
+        return gma_power_suspend(_dev);
+}
+
+int gma_power_restore(struct device *_dev)
+{
+        return gma_power_resume(_dev);
+}