xf86-video-intel: Branch 'modesetting' - 2 commits - src/i810_reg.h src/i830_display.c src/i830_sdvo.c

[Dave Airlie]

 src/i810_reg.h     |    2 +-
 src/i830_display.c |    2 +-
 src/i830_sdvo.c    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 0ba7b13fb4410c6a48b2fb098d2033e040eca6d2 (from 2991d81a3b643161babab6b8f44c057aaaf351c3)
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Apr 20 12:29:06 2006 +1000

    fix type 0 instead of O

diff --git a/src/i810_reg.h b/src/i810_reg.h
index 82571e0..2a03f32 100644
--- a/src/i810_reg.h
+++ b/src/i810_reg.h
@@ -722,7 +722,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # define PLLB_REF_INPUT_SPREADSPECTRUMIN	(3 << 13)
 # define DISPLAY_RATE_SELECT_FPA1		(1 << 8)
 # define SDVO_MULTIPLIER_MASK			0x000000ff
-# define SDV0_DEFAULT_MULTIPLIER		0x00000003
+# define SDVO_DEFAULT_MULTIPLIER		0x00000003
 
 #define FPA0		0x06040
 #define FPA1		0x06044
diff --git a/src/i830_display.c b/src/i830_display.c
index f8bd0d8..471b87e 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -384,7 +384,7 @@ i830PipeSetMode(ScrnInfoPtr pScrn, Displ
 	dpll |= PLL_REF_INPUT_TVCLKINBC;
     else
 	dpll |= PLL_REF_INPUT_DREFCLK;
-    dpll |= SDV0_DEFAULT_MULTIPLIER;
+    dpll |= SDVO_DEFAULT_MULTIPLIER;
 
     if (is_sdvo) {
 	dpll |= DPLL_DVO_HIGH_SPEED;
diff-tree 2991d81a3b643161babab6b8f44c057aaaf351c3 (from b5f099e03a9f58b6b99933fb06526bce4db72bd3)
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Apr 20 12:27:47 2006 +1000

    correct height parameter in sdvo packet

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 4d76044..0578461 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -366,8 +366,8 @@ I830SDVOCreatePreferredInputTiming(I830S
     s->sdvo_regs[SDVO_I2C_ARG_1] = (clock >> 8) & 0xff;
     s->sdvo_regs[SDVO_I2C_ARG_2] = width & 0xff;
     s->sdvo_regs[SDVO_I2C_ARG_3] = (width >> 8) & 0xff;
-    s->sdvo_regs[SDVO_I2C_ARG_4] = (height >> 8) & 0xff;
-    s->sdvo_regs[SDVO_I2C_ARG_5] = height & 0xff;  
+    s->sdvo_regs[SDVO_I2C_ARG_4] = height & 0xff;  
+    s->sdvo_regs[SDVO_I2C_ARG_5] = (height >> 8) & 0xff;
 
     I830SDVOWriteOutputs(s, 0);
     I830SDVOReadInputRegs(s);