summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_suspend.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-29 16:24:10 -0700
committerKeith Packard <keithp@keithp.com>2011-07-29 16:24:10 -0700
commit9b546e571b94cacccf1091cc9cc0bd8a6a207a66 (patch)
treefd50ef5eae6b8283e26926fa5d664f7e1cd88920 /drivers/gpu/drm/i915/i915_suspend.c
parent2c1756b12edc19fdd75c833699cb752e1bbb641e (diff)
parentcda2bb78c24de7674eafa3210314dc75bed344a6 (diff)
downloadop-kernel-dev-9b546e571b94cacccf1091cc9cc0bd8a6a207a66.zip
op-kernel-dev-9b546e571b94cacccf1091cc9cc0bd8a6a207a66.tar.gz
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
-rw-r--r--drivers/gpu/drm/i915/i915_suspend.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 2857586..87677d6 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -812,6 +812,7 @@ int i915_save_state(struct drm_device *dev)
dev_priv->saveFDI_RXB_IMR = I915_READ(_FDI_RXB_IMR);
dev_priv->saveMCHBAR_RENDER_STANDBY =
I915_READ(RSTDBYCTL);
+ dev_priv->savePCH_PORT_HOTPLUG = I915_READ(PCH_PORT_HOTPLUG);
} else {
dev_priv->saveIER = I915_READ(IER);
dev_priv->saveIMR = I915_READ(IMR);
@@ -863,6 +864,7 @@ int i915_restore_state(struct drm_device *dev)
I915_WRITE(GTIMR, dev_priv->saveGTIMR);
I915_WRITE(_FDI_RXA_IMR, dev_priv->saveFDI_RXA_IMR);
I915_WRITE(_FDI_RXB_IMR, dev_priv->saveFDI_RXB_IMR);
+ I915_WRITE(PCH_PORT_HOTPLUG, dev_priv->savePCH_PORT_HOTPLUG);
} else {
I915_WRITE(IER, dev_priv->saveIER);
I915_WRITE(IMR, dev_priv->saveIMR);
OpenPOWER on IntegriCloud