diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-01-09 16:04:06 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-01-09 16:04:06 -0800 |
| commit | d5b4dbe749e860e4349607c57467f8085dc28c33 (patch) | |
| tree | 48ba05d51124cad77021b03b2628fe027ff61f6f | |
| parent | cb103a18067adb3256c0b791255ce8435ff57e06 (diff) | |
| parent | 876657e613de6d9dd906c95e05fc590a84d1c322 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/mga_dh.c | 6 | ||||
| -rw-r--r-- | src/mga_g450pll.c | 5 | ||||
| -rw-r--r-- | src/mga_reg.h | 1 |
4 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 85908a2..fed3e39 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ(2.57) # When the version number is modified here, also modify it in src/mga.h. AC_INIT([xf86-video-mga], - 1.4.5, + 1.4.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) diff --git a/src/mga_dh.c b/src/mga_dh.c index be063e1..8cfd54c 100644 --- a/src/mga_dh.c +++ b/src/mga_dh.c @@ -207,7 +207,7 @@ void MGACRTC2Set(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo) /** Offset value*/ - OUTREG(MGAREG_C2OFFSET, pReg->crtc2[MGAREG2_C2VSYNC]); + OUTREG(MGAREG_C2OFFSET, pReg->crtc2[MGAREG2_C2OFFSET]); #ifdef DEBUG ErrorF("EXIT MGACRTC2Set\n"); #endif @@ -432,9 +432,9 @@ void MGACRTC2SetDisplayStart (ScrnInfoPtr pScrn, xMODEINFO *pModeInfo, CARD32 ba ErrorF("ENTER MGACRTC2SetDisplayStart\n"); #endif - OUTREG(MGAREG2_C2STARTADD0, pReg->crtc2[MGAREG2_C2STARTADD0]); + OUTREG(MGAREG_C2STARTADD0, pReg->crtc2[MGAREG2_C2STARTADD0]); #ifdef DEBUG - ErrorF("EXIT MGACRTC2GetDisplayStart\n"); + ErrorF("EXIT MGACRTC2SetDisplayStart\n"); #endif } diff --git a/src/mga_g450pll.c b/src/mga_g450pll.c index 69f0497..7407d14 100644 --- a/src/mga_g450pll.c +++ b/src/mga_g450pll.c @@ -274,11 +274,10 @@ static CARD32 G450IsPllLocked(ScrnInfoPtr pScrn, Bool *lpbLocked) MGAPtr pMga = MGAPTR(pScrn); - /* Pixel PLL */ if (!pMga->SecondCrtc) - OUTREG8(0x3c00, 0x4f); /* Pixel PLL */ + OUTREG8(0x3c00, MGA1064_PIX_PLL_STAT); else - OUTREG8(0x3c00, 0x8c); /* Video PLL */ + OUTREG8(0x3c00, MGA1064_VID_PLL_STAT); ulFallBackCounter = 0; diff --git a/src/mga_reg.h b/src/mga_reg.h index 93421d1..020bb0d 100644 --- a/src/mga_reg.h +++ b/src/mga_reg.h @@ -403,6 +403,7 @@ /*Added for G450 dual head*/ +#define MGA1064_VID_PLL_STAT 0x8c #define MGA1064_VID_PLL_P 0x8D #define MGA1064_VID_PLL_M 0x8E #define MGA1064_VID_PLL_N 0x8F |