diff -r -u xserver-xorg-video-psb-0.36.0-ref//src/psb_driver.h xserver-xorg-video-psb-0.36.0/src/psb_driver.h
--- xserver-xorg-video-psb-0.36.0-ref//src/psb_driver.h	2010-10-02 12:39:28.000000000 +0200
+++ xserver-xorg-video-psb-0.36.0/src/psb_driver.h	2011-02-18 22:06:14.000000000 +0100
@@ -133,7 +133,7 @@
 } PsbPanelFittingMode;
 
 #define PSB_DEBUG(_scrn, _level, ...)			\
-  xf86DrvMsgVerb(_scrn, X_INFO, _level, "Debug: " __VA_ARGS__ )
+  if(0){xf86DrvMsgVerb(_scrn, X_INFO, _level, "Debug: " __VA_ARGS__ );}
 #define ALIGN_TO(_arg, _align) \
   (((_arg) + ((_align) - 1)) & ~((_align) - 1))
 
diff -r -u xserver-xorg-video-psb-0.36.0-ref//src/psb_sdvo.c xserver-xorg-video-psb-0.36.0/src/psb_sdvo.c
--- xserver-xorg-video-psb-0.36.0-ref//src/psb_sdvo.c	2010-10-02 12:39:28.000000000 +0200
+++ xserver-xorg-video-psb-0.36.0/src/psb_sdvo.c	2011-02-18 22:13:28.000000000 +0100
@@ -3139,8 +3139,9 @@
     }
 
     int k;
-    for (k = 0; k < buf_size; k++)
+    for (k = 0; k < buf_size; k++){
         PSB_DEBUG(output->scrn->scrnIndex, 3, "HDMI BUFFER (%d 0): buf[%d] = 0x%x\n", hdmiBufIndex, k, buf[k]);
+    }
 /*
     for (i = 0; i <= av_split; i++) {
         set_buf_index[0] = i; set_buf_index[1] = 0;
@@ -3933,10 +3934,10 @@
 	} else if ((mode->Clock * 1000 >= 100000000)
 		   && (mode->Clock * 1000 < 200000000)) {
 	    i830_sdvo_set_clock_rate_mult(output, SDVO_CLOCK_RATE_MULT_1X);
-	} else
+	} else {
 	    PSB_DEBUG(output->scrn->scrnIndex, 3,
 		      "i830_sdvo_set_clock_rate is failed\n");
-
+        }
 	i830_sdvo_tv_settiming(output, mode, adjusted_mode);
 	mode = pSDVO->currentMode;
     }
@@ -4949,10 +4950,10 @@
 
         intel_output->isHDMI_Device = 0;        //initial the value to 0
         status = i830_sdvo_read_response(output, byargs, 2);
-        if (status != SDVO_CMD_STATUS_SUCCESS)
+        if (status != SDVO_CMD_STATUS_SUCCESS){
             PSB_DEBUG(output->scrn->scrnIndex, 3,
                         "psbSDVOInit: check HDMI device fail, no HDMI device\n");
-        else {
+        } else {
             intel_output->isHDMI_Device = byargs[1];
             PSB_DEBUG(output->scrn->scrnIndex, 3,
                       "psbSDVOInit: HDMI device value is %d\n",
@@ -5003,10 +5004,10 @@
 
 	    PSB_DEBUG(output->scrn->scrnIndex, 3, "Try to get edid_mon\n");
 	    edid_mon = xf86OutputGetEDID(output, intel_output->pDDCBus);
-	    if (!edid_mon)
+	    if (!edid_mon){
 		PSB_DEBUG(output->scrn->scrnIndex, 3,
 			  "Could not get edid_mon\n");
-
+            }
 	    if (edid_mon && edid_mon->no_sections) {
 		unsigned char *data = psbDDCRead_DDC2(output->scrn->scrnIndex,
 						      intel_output->pDDCBus,
@@ -5915,10 +5916,10 @@
 
         intel_output->isHDMI_Device = 0;        //initial the value to 0
         status = i830_sdvo_read_response(output, byargs, 2);
-        if (status != SDVO_CMD_STATUS_SUCCESS)
+        if (status != SDVO_CMD_STATUS_SUCCESS) {
             PSB_DEBUG(output->scrn->scrnIndex, 3,
                         "psbSDVOInit: check HDMI device fail, no HDMI device\n");
-        else {
+        } else {
             intel_output->isHDMI_Device = byargs[1];
             PSB_DEBUG(output->scrn->scrnIndex, 3,
                       "psbSDVOInit: HDMI device value is %d\n",