---

yaml --- r: 260006 b: refs/heads/master c: 2b9428e h: refs/heads/master v: v3
git-mirror · Jul 8, 2011 · ade980b · ade980b
1 parent 8d2d44b
commit ade980b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ed836acd2c7760e03c639566b59b4c1cc53a792
+refs/heads/master: 2b9428e20333ee42d00335c9700dcb20cf54f384
diff --git a/trunk/drivers/staging/gma500/gtt.c b/trunk/drivers/staging/gma500/gtt.c
@@ -397,7 +397,7 @@ int psb_gtt_init(struct drm_device *dev, int resume)
 	/* The root resource we allocate address space from */
 	dev_priv->gtt_initialized = 1;
 
-	pg->gtt_phys_start = dev_priv->pge_ctl;
+	pg->gtt_phys_start = dev_priv->pge_ctl & PAGE_MASK;
 
 	/*
 	 *	FIXME: video mmu has hw bug to access 0x0D0000000,