Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ec90668 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915: don't restore LVDS enable state blindly v2 



We still rely on a few LVDS bits, but restoring the enable bit can cause
trouble at this point, so don't.

v2: use the right mask to prevent restore (Daniel)
    conditionalize on KMS support (Denial)

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 02bcca0d

drivers/gpu/drm/i915/i915_suspend.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -255,6 +255,7 @@ static void i915_save_display(struct drm_device *dev) 
static void i915_restore_display(struct drm_device *dev)

static void i915_restore_display(struct drm_device *dev)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 mask = 0xffffffff;





	/* Display arbitration */

	/* Display arbitration */

	if (INTEL_INFO(dev)->gen <= 4)

	if (INTEL_INFO(dev)->gen <= 4)
@@ -267,10 +268,13 @@ static void i915_restore_display(struct drm_device *dev) 
	if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev))

	if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev))

		I915_WRITE(BLC_PWM_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2);

		I915_WRITE(BLC_PWM_CTL2, dev_priv->regfile.saveBLC_PWM_CTL2);





	if (drm_core_check_feature(dev, DRIVER_MODESET))

		mask = ~LVDS_PORT_EN;



	if (HAS_PCH_SPLIT(dev)) {

	if (HAS_PCH_SPLIT(dev)) {

		I915_WRITE(PCH_LVDS, dev_priv->regfile.saveLVDS);

		I915_WRITE(PCH_LVDS, dev_priv->regfile.saveLVDS & mask);

	} else if (IS_MOBILE(dev) && !IS_I830(dev))

	} else if (IS_MOBILE(dev) && !IS_I830(dev))

		I915_WRITE(LVDS, dev_priv->regfile.saveLVDS);

		I915_WRITE(LVDS, dev_priv->regfile.saveLVDS & mask);





	if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev))

	if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev))

		I915_WRITE(PFIT_CONTROL, dev_priv->regfile.savePFIT_CONTROL);

		I915_WRITE(PFIT_CONTROL, dev_priv->regfile.savePFIT_CONTROL);