diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-11 18:09:58 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-11 20:27:11 +0000 |
| commit | bee17e5ae6b68d21b9d193f34ccefeef9d4fffe0 (patch) | |
| tree | 7180032abb0d400752867fe0da563d9242f3808e /drivers/gpu | |
| parent | 47356eb67285014527a5ab87543ba1fae3d1e10a (diff) | |
| download | op-kernel-dev-bee17e5ae6b68d21b9d193f34ccefeef9d4fffe0.zip op-kernel-dev-bee17e5ae6b68d21b9d193f34ccefeef9d4fffe0.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 4e7dcb3..8f4f6bd 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; |
