diff options
| author | Clark Williams <williams@redhat.com> | 2012-02-03 15:10:42 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-03 15:10:42 -0600 |
| commit | 77f57fb93d132875acead3581bcdc5d2fefbe7a0 (patch) | |
| tree | 5db5ccf5e1754248edc790e2f37f3a2b863f0ddb /drivers/gpu/drm/i915/intel_sdvo.c | |
| parent | d28048db190097536aef2be5ee9a736bd7bb92eb (diff) | |
| parent | 69bade053d0f2ef0c8ee98af9f6699a55a8d8bb9 (diff) | |
Merge commit 'v3.2.3' into rt-3.2.3-rt10
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index f7b9268df266..e334ec33a47d 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1066,15 +1066,13 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, /* Set the SDVO control regs. */ if (INTEL_INFO(dev)->gen >= 4) { - sdvox = 0; + /* The real mode polarity is set by the SDVO commands, using + * struct intel_sdvo_dtd. */ + sdvox = SDVO_VSYNC_ACTIVE_HIGH | SDVO_HSYNC_ACTIVE_HIGH; if (intel_sdvo->is_hdmi) sdvox |= intel_sdvo->color_range; if (INTEL_INFO(dev)->gen < 5) sdvox |= SDVO_BORDER_ENABLE; - if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) - sdvox |= SDVO_VSYNC_ACTIVE_HIGH; - if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) - sdvox |= SDVO_HSYNC_ACTIVE_HIGH; } else { sdvox = I915_READ(intel_sdvo->sdvo_reg); switch (intel_sdvo->sdvo_reg) { |