diff options
author | Ben Widawsky <benjamin.widawsky@intel.com> | 2012-12-18 13:31:26 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-20 10:28:42 -0500 |
commit | 06e5598fce5ce89fe8bf081398296e5b08d993dd (patch) | |
tree | 3c00031aed1df894613b53c3900192dd677ec367 /include/drm/intel-gtt.h | |
parent | d7e5008f7c2077d856e40a3af746f1a47028b5f2 (diff) |
drm/i915: Move GSM mapping into dev_priv
This removes an unused field from the AGP structure and moves it into
the dev_priv structure (with a slightly better name). This builds upon
the kill-agp series already merged.
GSM is a well defined term in the bspec:
GSM: Graphics Stolen Memory
GTT stolen space is defined for storage of the GFX GTT entries in
physical memory. IA can not access GSM directly , it can only access via
GTTMMADR. GT can access GSM directly or through GTTMMADR.
This is not the entire stolen space.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm/intel-gtt.h')
-rw-r--r-- | include/drm/intel-gtt.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 6eb76a1f11ab..3e3a166a2690 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h | |||
@@ -18,8 +18,6 @@ struct intel_gtt { | |||
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 | struct page *scratch_page; | 20 | struct page *scratch_page; |
21 | /* for ppgtt PDE access */ | ||
22 | u32 __iomem *gtt; | ||
23 | /* needed for ioremap in drm/i915 */ | 21 | /* needed for ioremap in drm/i915 */ |
24 | phys_addr_t gma_bus_addr; | 22 | phys_addr_t gma_bus_addr; |
25 | } *intel_gtt_get(void); | 23 | } *intel_gtt_get(void); |