redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/i915: Only save/restore FBC on the platform that supports FBC

Browse source 
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
This commit is contained in:
Zhao Yakui 2010-03-19 17:05:10 +08:00 committed by Eric Anholt
parent 8a1837cef7
commit a2c459ee9a
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/gpu/drm/i915/i915_suspend.c
View file

@ -600,14 +600,16 @@ void i915_save_display(struct drm_device *dev)
} }
/* FIXME: save TV & SDVO state */ /* FIXME: save TV & SDVO state */
/* FBC state */ /* Only save FBC state on the platform that supports FBC */
if (IS_GM45(dev)) { if (I915_HAS_FBC(dev)) {
dev_priv->saveDPFC_CB_BASE = I915_READ(DPFC_CB_BASE); if (IS_GM45(dev)) {
} else { dev_priv->saveDPFC_CB_BASE = I915_READ(DPFC_CB_BASE);
dev_priv->saveFBC_CFB_BASE = I915_READ(FBC_CFB_BASE); } else {
dev_priv->saveFBC_LL_BASE = I915_READ(FBC_LL_BASE); dev_priv->saveFBC_CFB_BASE = I915_READ(FBC_CFB_BASE);
dev_priv->saveFBC_CONTROL2 = I915_READ(FBC_CONTROL2); dev_priv->saveFBC_LL_BASE = I915_READ(FBC_LL_BASE);
dev_priv->saveFBC_CONTROL = I915_READ(FBC_CONTROL); dev_priv->saveFBC_CONTROL2 = I915_READ(FBC_CONTROL2);
dev_priv->saveFBC_CONTROL = I915_READ(FBC_CONTROL);
}
} }
/* VGA state */ /* VGA state */
@ -702,18 +704,19 @@ void i915_restore_display(struct drm_device *dev)
} }
/* FIXME: restore TV & SDVO state */ /* FIXME: restore TV & SDVO state */
/* FBC info */ /* only restore FBC info on the platform that supports FBC*/
if (IS_GM45(dev)) { if (I915_HAS_FBC(dev)) {
g4x_disable_fbc(dev); if (IS_GM45(dev)) {
I915_WRITE(DPFC_CB_BASE, dev_priv->saveDPFC_CB_BASE); g4x_disable_fbc(dev);
} else { I915_WRITE(DPFC_CB_BASE, dev_priv->saveDPFC_CB_BASE);
i8xx_disable_fbc(dev); } else {
I915_WRITE(FBC_CFB_BASE, dev_priv->saveFBC_CFB_BASE); i8xx_disable_fbc(dev);
I915_WRITE(FBC_LL_BASE, dev_priv->saveFBC_LL_BASE); I915_WRITE(FBC_CFB_BASE, dev_priv->saveFBC_CFB_BASE);
I915_WRITE(FBC_CONTROL2, dev_priv->saveFBC_CONTROL2); I915_WRITE(FBC_LL_BASE, dev_priv->saveFBC_LL_BASE);
I915_WRITE(FBC_CONTROL, dev_priv->saveFBC_CONTROL); I915_WRITE(FBC_CONTROL2, dev_priv->saveFBC_CONTROL2);
I915_WRITE(FBC_CONTROL, dev_priv->saveFBC_CONTROL);
}
} }
/* VGA state */ /* VGA state */
if (IS_IRONLAKE(dev)) if (IS_IRONLAKE(dev))
I915_WRITE(CPU_VGACNTRL, dev_priv->saveVGACNTRL); I915_WRITE(CPU_VGACNTRL, dev_priv->saveVGACNTRL);