diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 72a4f64..f508e23 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1100,10 +1100,6 @@ i830_sdvo_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 			&in_out, sizeof(in_out));
     status = i830_sdvo_read_response(output, NULL, 0);
 
-    if (dev_priv->is_hdmi) {
-	i830_sdvo_set_avi_infoframe(output, mode);
-	sdvox |= SDVO_AUDIO_ENABLE;
-    }
 
     /* We have tried to get input timing in mode_fixup, and filled into
        adjusted_mode */
@@ -1161,6 +1157,7 @@ i830_sdvo_mode_set(xf86OutputPtr output, DisplayModePtr mode,
     if (IS_I965G(pI830)) {
 	sdvox |= SDVO_BORDER_ENABLE |
 		SDVO_VSYNC_ACTIVE_HIGH |
+                SDVO_NULL_PACKETS_DURING_VSYNC |
 		SDVO_HSYNC_ACTIVE_HIGH;
     } else {
 	sdvox |= INREG(dev_priv->output_device);