diff options
author | Michel Thierry <michel.thierry@intel.com> | 2015-03-24 11:46:21 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-27 04:25:19 -0400 |
commit | 59568eb59a20c743623de9c3247d4e22af1a3573 (patch) | |
tree | f7482154a3771aacb7a8e32515795b27006ad163 | |
parent | 1266cdb1c236eabd49cbf1e45f401159fb4c21d1 (diff) |
drm/i915: Remove unnecessary gen6_ppgtt_unmap_pages
We are already unmapping them in gen6_ppgtt_free. This function became
redundant since commit 06fda602dbca9c59d87db7da71192e4b54c9f5ff
("drm/i915: Create page table allocators").
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 9c155d1f852f..a322e31655b5 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c | |||
@@ -1155,16 +1155,6 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, | |||
1155 | kunmap_atomic(pt_vaddr); | 1155 | kunmap_atomic(pt_vaddr); |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | static void gen6_ppgtt_unmap_pages(struct i915_hw_ppgtt *ppgtt) | ||
1159 | { | ||
1160 | int i; | ||
1161 | |||
1162 | for (i = 0; i < ppgtt->num_pd_entries; i++) | ||
1163 | pci_unmap_page(ppgtt->base.dev->pdev, | ||
1164 | ppgtt->pd.page_table[i]->daddr, | ||
1165 | 4096, PCI_DMA_BIDIRECTIONAL); | ||
1166 | } | ||
1167 | |||
1168 | /* PDE TLBs are a pain invalidate pre GEN8. It requires a context reload. If we | 1158 | /* PDE TLBs are a pain invalidate pre GEN8. It requires a context reload. If we |
1169 | * are switching between contexts with the same LRCA, we also must do a force | 1159 | * are switching between contexts with the same LRCA, we also must do a force |
1170 | * restore. | 1160 | * restore. |
@@ -1215,7 +1205,6 @@ static void gen6_ppgtt_cleanup(struct i915_address_space *vm) | |||
1215 | 1205 | ||
1216 | drm_mm_remove_node(&ppgtt->node); | 1206 | drm_mm_remove_node(&ppgtt->node); |
1217 | 1207 | ||
1218 | gen6_ppgtt_unmap_pages(ppgtt); | ||
1219 | gen6_ppgtt_free(ppgtt); | 1208 | gen6_ppgtt_free(ppgtt); |
1220 | } | 1209 | } |
1221 | 1210 | ||