diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 09:24:24 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 10:43:18 -0500 |
commit | c64f7ba5f1006d8c20eacafecf98d4d00a6902a0 (patch) | |
tree | 0309e263e05be06e718d6a07169802ac026aef68 /drivers/gpu/drm/i915/i915_dma.c | |
parent | 1b6064d79b9a1c5e5aa6fcc6855f3da5e639ff73 (diff) |
agp/intel: Remove confusion of stolen entries not stolen memory
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 3df271215ab9..86b0e8052ec9 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1044,7 +1044,7 @@ static unsigned long i915_stolen_to_phys(struct drm_device *dev, u32 offset) | |||
1044 | pci_read_config_byte(pdev, 0x9c, &val); | 1044 | pci_read_config_byte(pdev, 0x9c, &val); |
1045 | base = val >> 3 << 27; | 1045 | base = val >> 3 << 27; |
1046 | } | 1046 | } |
1047 | base -= dev_priv->mm.gtt->gtt_stolen_entries << PAGE_SHIFT; | 1047 | base -= dev_priv->mm.gtt->stolen_size; |
1048 | #endif | 1048 | #endif |
1049 | 1049 | ||
1050 | return base + offset; | 1050 | return base + offset; |
@@ -1168,7 +1168,7 @@ static int i915_load_modeset_init(struct drm_device *dev) | |||
1168 | unsigned long prealloc_size, gtt_size, mappable_size; | 1168 | unsigned long prealloc_size, gtt_size, mappable_size; |
1169 | int ret = 0; | 1169 | int ret = 0; |
1170 | 1170 | ||
1171 | prealloc_size = dev_priv->mm.gtt->gtt_stolen_entries << PAGE_SHIFT; | 1171 | prealloc_size = dev_priv->mm.gtt->stolen_size; |
1172 | gtt_size = dev_priv->mm.gtt->gtt_total_entries << PAGE_SHIFT; | 1172 | gtt_size = dev_priv->mm.gtt->gtt_total_entries << PAGE_SHIFT; |
1173 | mappable_size = dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT; | 1173 | mappable_size = dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT; |
1174 | 1174 | ||