From: Michel Thierry Date: Tue, 24 Mar 2015 15:46:21 +0000 (+0000) Subject: drm/i915: Remove unnecessary gen6_ppgtt_unmap_pages X-Git-Tag: MMI-PSA29.97-13-9~9777^2~58^2~186 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59568eb59a20c743623de9c3247d4e22af1a3573;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Michel Thierry Reviewed-by: Mika Kuoppala Signed-off-by: Daniel Vetter --- 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, kunmap_atomic(pt_vaddr); } -static void gen6_ppgtt_unmap_pages(struct i915_hw_ppgtt *ppgtt) -{ - int i; - - for (i = 0; i < ppgtt->num_pd_entries; i++) - pci_unmap_page(ppgtt->base.dev->pdev, - ppgtt->pd.page_table[i]->daddr, - 4096, PCI_DMA_BIDIRECTIONAL); -} - /* PDE TLBs are a pain invalidate pre GEN8. It requires a context reload. If we * are switching between contexts with the same LRCA, we also must do a force * restore. @@ -1215,7 +1205,6 @@ static void gen6_ppgtt_cleanup(struct i915_address_space *vm) drm_mm_remove_node(&ppgtt->node); - gen6_ppgtt_unmap_pages(ppgtt); gen6_ppgtt_free(ppgtt); }