diff options
author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-11-03 00:07:17 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-08 12:09:44 -0500 |
commit | d31eb10e6c9f0f040c82ab710f93ce95e6f14d89 (patch) | |
tree | 7d595f3a2c0d113f41bd851a44117ac619682f72 /drivers/gpu/drm | |
parent | 63340133f3d58634b068f15f9f43f905ea94b837 (diff) |
drm/i915/bdw: Create gen8_gtt_pte_t
With gen6 PTE type in place, pave the way for the new gen8 type.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index ee71aa558f9a..b66284e10032 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #define GEN6_PPGTT_PD_ENTRIES 512 | 31 | #define GEN6_PPGTT_PD_ENTRIES 512 |
32 | #define I915_PPGTT_PT_ENTRIES (PAGE_SIZE / sizeof(gen6_gtt_pte_t)) | 32 | #define I915_PPGTT_PT_ENTRIES (PAGE_SIZE / sizeof(gen6_gtt_pte_t)) |
33 | typedef uint64_t gen8_gtt_pte_t; | ||
33 | 34 | ||
34 | /* PPGTT stuff */ | 35 | /* PPGTT stuff */ |
35 | #define GEN6_GTT_ADDR_ENCODE(addr) ((addr) | (((addr) >> 28) & 0xff0)) | 36 | #define GEN6_GTT_ADDR_ENCODE(addr) ((addr) | (((addr) >> 28) & 0xff0)) |
@@ -942,7 +943,7 @@ static int gen8_gmch_probe(struct drm_device *dev, | |||
942 | *stolen = gen8_get_stolen_size(snb_gmch_ctl); | 943 | *stolen = gen8_get_stolen_size(snb_gmch_ctl); |
943 | 944 | ||
944 | gtt_size = gen8_get_total_gtt_size(snb_gmch_ctl); | 945 | gtt_size = gen8_get_total_gtt_size(snb_gmch_ctl); |
945 | *gtt_total = (gtt_size / 8) << PAGE_SHIFT; | 946 | *gtt_total = (gtt_size / sizeof(gen8_gtt_pte_t)) << PAGE_SHIFT; |
946 | 947 | ||
947 | ret = ggtt_probe_common(dev, gtt_size); | 948 | ret = ggtt_probe_common(dev, gtt_size); |
948 | 949 | ||