diff options
| author | Zhao Yakui | 2009-09-10 09:45:49 +0200 |
|---|---|---|
| committer | Eric Anholt | 2009-09-10 20:31:04 +0200 |
| commit | bb66c5122b4300b475b585fffb811311f39f5431 (patch) | |
| tree | 0d356b75e3d0e9002bf40df02b400bc137e8b4f3 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Add the missing clone_mask for SDVO-VGA(RGB1) (diff) | |
| download | kernel-qcow2-linux-bb66c5122b4300b475b585fffb811311f39f5431.tar.gz kernel-qcow2-linux-bb66c5122b4300b475b585fffb811311f39f5431.tar.xz kernel-qcow2-linux-bb66c5122b4300b475b585fffb811311f39f5431.zip | |
drm/i915: Write zero to DPLL_MD Reg for non-SDVO output
When the output device is LVDS, maybe the pixel clock of adjusted_mode will be
less than that in mode. In such case it will set the incorrect multipler factor
in DPLL_MD register.
So the dpll_md_reg will be reset when the output type is non-SDVO
https://bugs.freedesktop.org/show_bug.cgi?id=22761
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Reviewd-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 155719ff99d1..cb5305ccb15c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2652,9 +2652,12 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, udelay(150); if (IS_I965G(dev) && !IS_IGDNG(dev)) { - sdvo_pixel_multiply = adjusted_mode->clock / mode->clock; - I915_WRITE(dpll_md_reg, (0 << DPLL_MD_UDI_DIVIDER_SHIFT) | + if (is_sdvo) { + sdvo_pixel_multiply = adjusted_mode->clock / mode->clock; + I915_WRITE(dpll_md_reg, (0 << DPLL_MD_UDI_DIVIDER_SHIFT) | ((sdvo_pixel_multiply - 1) << DPLL_MD_UDI_MULTIPLIER_SHIFT)); + } else + I915_WRITE(dpll_md_reg, 0); } else { /* write it again -- the BIOS does, after all */ I915_WRITE(dpll_reg, dpll); |