xf86-video-intel: Branch 'xf86-video-intel-2.2-branch' - 2 commits - src/i810_reg.h src/i830_display.c src/i830_driver.c

[Zhenyu Wang]

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

New commits:
commit aa1813e4807e500fb122f36af988cf60f91e05a5
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Tue Feb 19 08:51:53 2008 +0800

    Fix last 8XX clock's p2 value commit
    
    My fault to change Hong's origin patch reversely.

diff --git a/src/i830_display.c b/src/i830_display.c
index 7a2520d..8f7c068 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1640,10 +1640,11 @@ i830_crtc_clock_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc)
 	    clock.p1 = ffs((dpll & DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) >>
 			   DPLL_FPA01_P1_POST_DIV_SHIFT);
 
+	    /* if LVDS is dual-channel, p2 = 7 */
 	    if ((INREG(LVDS) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP)
-		clock.p2 = I8XX_P2_LVDS_SLOW;
+		clock.p2 = 7;
 	    else
-		clock.p2 = I8XX_P2_LVDS_FAST;
+		clock.p2 = 14;
 
 	    if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)
 		i8xx_clock(66000, &clock); /* XXX: might not be 66MHz */
commit 1cea254b70158600d9dfff8ba66fb2ec0a6e0f67
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Fri Feb 15 13:20:22 2008 +0800

    Bug #14440: fix stolen mem size mask on i830M
    
    For i830M stolen mem size mask should always be 0x70.
    Use 0xF0 for later chipsets should be ok, so behavior is
    identical to kernel agp.

diff --git a/src/i810_reg.h b/src/i810_reg.h
index bed3901..e69ae0a 100644
--- a/src/i810_reg.h
+++ b/src/i810_reg.h
@@ -2134,7 +2134,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define I830_GMCH_MEM_64M	0x1
 #define I830_GMCH_MEM_128M	0
 
-#define I830_GMCH_GMS_MASK			0xF0
+#define I830_GMCH_GMS_MASK			0x70
 #define I830_GMCH_GMS_DISABLED			0x00
 #define I830_GMCH_GMS_LOCAL			0x10
 #define I830_GMCH_GMS_STOLEN_512		0x20
@@ -2145,7 +2145,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define I830_RDRAM_ND(x)			(((x) & 0x20) >> 5)
 #define I830_RDRAM_DDT(x)			(((x) & 0x18) >> 3)
 
-#define I855_GMCH_GMS_MASK			(0x7 << 4)
+#define I855_GMCH_GMS_MASK			(0xF << 4)
 #define I855_GMCH_GMS_DISABLED			0x00
 #define I855_GMCH_GMS_STOLEN_1M			(0x1 << 4)
 #define I855_GMCH_GMS_STOLEN_4M			(0x2 << 4)
diff --git a/src/i830_driver.c b/src/i830_driver.c
index f9c1dfd..477c50a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -495,7 +495,7 @@ I830DetectMemory(ScrnInfoPtr pScrn)
    range = gtt_size + 4;
 
    if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
-      switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
+      switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
       case I855_GMCH_GMS_STOLEN_1M:
 	 memsize = MB(1) - KB(range);
 	 break;