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) {