---

yaml --- r: 293573 b: refs/heads/master c: 428ccb2 h: refs/heads/master i: 293571: 7332b08 v: v3
git-mirror · Feb 9, 2012 · 3f12360 · 3f12360
1 parent 57a43fc
commit 3f12360
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50a4c4a94d24fe13167e3ab1dc1486623369c31a
+refs/heads/master: 428ccb21b740f603a6a1f08cbe6d935fb3177620
diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c
@@ -680,6 +680,7 @@ static int intel_gtt_init(void)
 		iounmap(intel_private.registers);
 		return -ENOMEM;
 	}
+	intel_private.base.gtt = intel_private.gtt;
 
 	global_cache_flush();   /* FIXME: ? */
 

diff --git a/trunk/include/drm/intel-gtt.h b/trunk/include/drm/intel-gtt.h
@@ -17,6 +17,8 @@ const struct intel_gtt {
 	unsigned int do_idle_maps : 1;
 	/* Share the scratch page dma with ppgtts. */
 	dma_addr_t scratch_page_dma;
+	/* for ppgtt PDE access */
+	u32 __iomem *gtt;
 } *intel_gtt_get(void);
 
 void intel_gtt_chipset_flush(void);