From 3f12360a544649d83c67bb5d07133481fe2a7a8f Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 9 Feb 2012 17:15:45 +0100
Subject: [PATCH] --- yaml --- r: 293573 b: refs/heads/master c:
 428ccb21b740f603a6a1f08cbe6d935fb3177620 h: refs/heads/master i:   293571:
 7332b08e6ad94fce2ca9dcaeb21ce9f99ce2f981 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/intel-gtt.c | 1 +
 trunk/include/drm/intel-gtt.h      | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b7609c612a00..96e4d749f0ad 100644
--- 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
index 0a305acb0374..5cf47ac2d401 100644
--- 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
index 6d4c77ac7d76..0a0001b9dc78 100644
--- 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);