Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_sdvo.c

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 03c231be22736082d89a4b69aeb593f5e6b3b127..d9d4d51aa89e618ca6056db3f35a3e7666e65853 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1237,9 +1237,11 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
 
        /* Set the SDVO control regs. */
        if (IS_I965G(dev)) {
-               sdvox |= SDVO_BORDER_ENABLE |
-                       SDVO_VSYNC_ACTIVE_HIGH |
-                       SDVO_HSYNC_ACTIVE_HIGH;
+               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(sdvo_priv->sdvo_reg);
                switch (sdvo_priv->sdvo_reg) {