diff options
Diffstat (limited to 'include/drm/intel-gtt.h')
-rw-r--r-- | include/drm/intel-gtt.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 2e37e9f02e71..6eb76a1f11ab 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h | |||
@@ -3,7 +3,7 @@ | |||
3 | #ifndef _DRM_INTEL_GTT_H | 3 | #ifndef _DRM_INTEL_GTT_H |
4 | #define _DRM_INTEL_GTT_H | 4 | #define _DRM_INTEL_GTT_H |
5 | 5 | ||
6 | const struct intel_gtt { | 6 | struct intel_gtt { |
7 | /* Size of memory reserved for graphics by the BIOS */ | 7 | /* Size of memory reserved for graphics by the BIOS */ |
8 | unsigned int stolen_size; | 8 | unsigned int stolen_size; |
9 | /* Total number of gtt entries. */ | 9 | /* Total number of gtt entries. */ |
@@ -17,6 +17,7 @@ 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 | struct page *scratch_page; | ||
20 | /* for ppgtt PDE access */ | 21 | /* for ppgtt PDE access */ |
21 | u32 __iomem *gtt; | 22 | u32 __iomem *gtt; |
22 | /* needed for ioremap in drm/i915 */ | 23 | /* needed for ioremap in drm/i915 */ |
@@ -39,10 +40,6 @@ void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries); | |||
39 | #define AGP_DCACHE_MEMORY 1 | 40 | #define AGP_DCACHE_MEMORY 1 |
40 | #define AGP_PHYS_MEMORY 2 | 41 | #define AGP_PHYS_MEMORY 2 |
41 | 42 | ||
42 | /* New caching attributes for gen6/sandybridge */ | ||
43 | #define AGP_USER_CACHED_MEMORY_LLC_MLC (AGP_USER_TYPES + 2) | ||
44 | #define AGP_USER_UNCACHED_MEMORY (AGP_USER_TYPES + 4) | ||
45 | |||
46 | /* flag for GFDT type */ | 43 | /* flag for GFDT type */ |
47 | #define AGP_USER_CACHED_MEMORY_GFDT (1 << 3) | 44 | #define AGP_USER_CACHED_MEMORY_GFDT (1 << 3) |
48 | 45 | ||