diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-09 11:15:45 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-09 15:24:18 -0500 |
commit | 428ccb21b740f603a6a1f08cbe6d935fb3177620 (patch) | |
tree | 397bab4ab8906e62430be6b3c02c75e9ff6bec90 | |
parent | 50a4c4a94d24fe13167e3ab1dc1486623369c31a (diff) |
agp/intel-gtt: export the gtt pagetable iomapping
We need this because ppgtt page directory entries need to be in the
global gtt pagetable.
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/char/agp/intel-gtt.c | 1 | ||||
-rw-r--r-- | include/drm/intel-gtt.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 0a305acb0374..5cf47ac2d401 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
@@ -680,6 +680,7 @@ static int intel_gtt_init(void) | |||
680 | iounmap(intel_private.registers); | 680 | iounmap(intel_private.registers); |
681 | return -ENOMEM; | 681 | return -ENOMEM; |
682 | } | 682 | } |
683 | intel_private.base.gtt = intel_private.gtt; | ||
683 | 684 | ||
684 | global_cache_flush(); /* FIXME: ? */ | 685 | global_cache_flush(); /* FIXME: ? */ |
685 | 686 | ||
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 6d4c77ac7d76..0a0001b9dc78 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h | |||
@@ -17,6 +17,8 @@ const struct intel_gtt { | |||
17 | unsigned int do_idle_maps : 1; | 17 | unsigned int do_idle_maps : 1; |
18 | /* Share the scratch page dma with ppgtts. */ | 18 | /* Share the scratch page dma with ppgtts. */ |
19 | dma_addr_t scratch_page_dma; | 19 | dma_addr_t scratch_page_dma; |
20 | /* for ppgtt PDE access */ | ||
21 | u32 __iomem *gtt; | ||
20 | } *intel_gtt_get(void); | 22 | } *intel_gtt_get(void); |
21 | 23 | ||
22 | void intel_gtt_chipset_flush(void); | 24 | void intel_gtt_chipset_flush(void); |