From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 11 Jan 2011 18:09:58 +0000 (+0000)
Subject: drm/i915/lvds: Always use 0 to disable the pfit controller
X-Git-Tag: v2.6.38-rc1~398^2~2^2~30
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bee17e5ae6b68d21b9d193f34ccefeef9d4fffe0;p=karo-tx-linux.git

drm/i915/lvds: Always use 0 to disable the pfit controller

... and just any combination of bits & ~PFIT_ENABLE. This way we do not
attempt disable to the panel fitter controller uselessly upon
intel_lvds_disable().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 4e7dcb330dad..8f4f6bd33ee9 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -374,6 +374,10 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
 	}
 
 out:
+	if ((pfit_control & PFIT_ENABLE) == 0) {
+		pfit_control = 0;
+		pfit_pgm_ratios = 0;
+	}
 	if (pfit_control != intel_lvds->pfit_control ||
 	    pfit_pgm_ratios != intel_lvds->pfit_pgm_ratios) {
 		intel_lvds->pfit_control = pfit_control;