|
@@ -37,20 +37,6 @@ static void i915_save_display(struct drm_device *dev)
|
|
|
if (INTEL_INFO(dev)->gen <= 4)
|
|
|
dev_priv->regfile.saveDSPARB = I915_READ(DSPARB);
|
|
|
|
|
|
- /* LVDS state */
|
|
|
- if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
|
|
|
- dev_priv->regfile.saveLVDS = I915_READ(PCH_LVDS);
|
|
|
- else if (INTEL_INFO(dev)->gen <= 4 && IS_MOBILE(dev) && !IS_I830(dev))
|
|
|
- dev_priv->regfile.saveLVDS = I915_READ(LVDS);
|
|
|
-
|
|
|
- /* Panel power sequencer */
|
|
|
- if (HAS_PCH_SPLIT(dev_priv) || INTEL_GEN(dev_priv) <= 4) {
|
|
|
- dev_priv->regfile.savePP_CONTROL = I915_READ(PP_CONTROL(0));
|
|
|
- dev_priv->regfile.savePP_ON_DELAYS = I915_READ(PP_ON_DELAYS(0));
|
|
|
- dev_priv->regfile.savePP_OFF_DELAYS = I915_READ(PP_OFF_DELAYS(0));
|
|
|
- dev_priv->regfile.savePP_DIVISOR = I915_READ(PP_DIVISOR(0));
|
|
|
- }
|
|
|
-
|
|
|
/* save FBC interval */
|
|
|
if (HAS_FBC(dev) && INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev))
|
|
|
dev_priv->regfile.saveFBC_CONTROL = I915_READ(FBC_CONTROL);
|
|
@@ -59,28 +45,11 @@ static void i915_save_display(struct drm_device *dev)
|
|
|
static void i915_restore_display(struct drm_device *dev)
|
|
|
{
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
|
|
- u32 mask = 0xffffffff;
|
|
|
|
|
|
/* Display arbitration */
|
|
|
if (INTEL_INFO(dev)->gen <= 4)
|
|
|
I915_WRITE(DSPARB, dev_priv->regfile.saveDSPARB);
|
|
|
|
|
|
- mask = ~LVDS_PORT_EN;
|
|
|
-
|
|
|
- /* LVDS state */
|
|
|
- if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
|
|
|
- I915_WRITE(PCH_LVDS, dev_priv->regfile.saveLVDS & mask);
|
|
|
- else if (INTEL_INFO(dev)->gen <= 4 && IS_MOBILE(dev) && !IS_I830(dev))
|
|
|
- I915_WRITE(LVDS, dev_priv->regfile.saveLVDS & mask);
|
|
|
-
|
|
|
- /* Panel power sequencer */
|
|
|
- if (HAS_PCH_SPLIT(dev_priv) || INTEL_GEN(dev_priv) <= 4) {
|
|
|
- I915_WRITE(PP_ON_DELAYS(0), dev_priv->regfile.savePP_ON_DELAYS);
|
|
|
- I915_WRITE(PP_OFF_DELAYS(0), dev_priv->regfile.savePP_OFF_DELAYS);
|
|
|
- I915_WRITE(PP_DIVISOR(0), dev_priv->regfile.savePP_DIVISOR);
|
|
|
- I915_WRITE(PP_CONTROL(0), dev_priv->regfile.savePP_CONTROL);
|
|
|
- }
|
|
|
-
|
|
|
/* only restore FBC info on the platform that supports FBC*/
|
|
|
intel_fbc_global_disable(dev_priv);
|
|
|
|