From patchwork Sat May 10 03:59:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 4146211 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 19FC4BFF02 for ; Sat, 10 May 2014 04:01:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28425201DE for ; Sat, 10 May 2014 04:01:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 43B58201DC for ; Sat, 10 May 2014 04:01:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB48B6F087; Fri, 9 May 2014 21:01:25 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id D19626F086 for ; Fri, 9 May 2014 21:01:24 -0700 (PDT) Received: by mail.bwidawsk.net (Postfix, from userid 5001) id D1C8C5807E; Fri, 9 May 2014 21:01:23 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from ironside.intel.com (c-24-21-100-90.hsd1.or.comcast.net [24.21.100.90]) by mail.bwidawsk.net (Postfix) with ESMTPSA id 9EE2458081; Fri, 9 May 2014 21:00:15 -0700 (PDT) From: Ben Widawsky To: Intel GFX Date: Fri, 9 May 2014 20:59:18 -0700 Message-Id: <1399694391-3935-24-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1399694391-3935-1-git-send-email-benjamin.widawsky@intel.com> References: <1399694391-3935-1-git-send-email-benjamin.widawsky@intel.com> Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH 23/56] drm/i915: Always dma map page table allocations X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP There is never a case where we don't want to do it. Since we've broken up the allocations into nice clean helper functions, it's both easy and obvious to do the dma mapping at the same time. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_gtt.c | 78 ++++++++----------------------------- 1 file changed, 17 insertions(+), 61 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index e8d4dfa..92ffee7 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -215,20 +215,6 @@ static gen6_gtt_pte_t iris_pte_encode(dma_addr_t addr, pci_unmap_page((dev)->pdev, (pt)->daddr, 4096, PCI_DMA_BIDIRECTIONAL); \ } while (0); - -static void dma_unmap_pt_range(struct i915_pagedir *pd, - unsigned pde, size_t n, - struct drm_device *dev) -{ - if (WARN_ON(pde + n > I915_PDES_PER_PD)) - n = I915_PDES_PER_PD - pde; - - n += pde; - - for (; pde < n; pde++) - dma_unmap_pt_single(pd->page_tables[pde], dev); -} - /** * dma_map_pt_single() - Create a dma mapping for a page table * @pt: Page table to get a DMA map for @@ -258,33 +244,12 @@ static int dma_map_pt_single(struct i915_pagetab *pt, struct drm_device *dev) return 0; } -static int dma_map_pt_range(struct i915_pagedir *pd, - unsigned pde, size_t n, - struct drm_device *dev) -{ - const int first = pde; - - if (WARN_ON(pde + n > I915_PDES_PER_PD)) - n = I915_PDES_PER_PD - pde; - - n += pde; - - for (; pde < n; pde++) { - int ret; - ret = dma_map_pt_single(pd->page_tables[pde], dev); - if (ret) { - dma_unmap_pt_range(pd, first, pde, dev); - return ret; - } - } - - return 0; -} - -static void free_pt_single(struct i915_pagetab *pt) +static void free_pt_single(struct i915_pagetab *pt, struct drm_device *dev) { if (WARN_ON(!pt->page)) return; + + dma_unmap_pt_single(pt, dev); __free_page(pt->page); kfree(pt); } @@ -292,6 +257,7 @@ static void free_pt_single(struct i915_pagetab *pt) static struct i915_pagetab *alloc_pt_single(struct drm_device *dev) { struct i915_pagetab *pt; + int ret; pt = kzalloc(sizeof(*pt), GFP_KERNEL); if (!pt) @@ -303,6 +269,13 @@ static struct i915_pagetab *alloc_pt_single(struct drm_device *dev) return ERR_PTR(-ENOMEM); } + ret = dma_map_pt_single(pt, dev); + if (ret) { + __free_page(pt->page); + kfree(pt); + return ERR_PTR(ret); + } + return pt; } @@ -346,7 +319,7 @@ static int alloc_pt_range(struct i915_pagedir *pd, uint16_t pde, size_t count, err_out: while (i--) - free_pt_single(pd->page_tables[i]); + free_pt_single(pd->page_tables[i], dev); return ret; } @@ -521,7 +494,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, } } -static void gen8_free_page_tables(struct i915_pagedir *pd) +static void gen8_free_page_tables(struct i915_pagedir *pd, struct drm_device *dev) { int i; @@ -529,7 +502,7 @@ static void gen8_free_page_tables(struct i915_pagedir *pd) return; for (i = 0; i < I915_PDES_PER_PD; i++) { - free_pt_single(pd->page_tables[i]); + free_pt_single(pd->page_tables[i], dev); pd->page_tables[i] = NULL; } } @@ -539,7 +512,7 @@ static void gen8_ppgtt_free(struct i915_hw_ppgtt *ppgtt) int i; for (i = 0; i < ppgtt->num_pd_pages; i++) { - gen8_free_page_tables(ppgtt->pdp.pagedir[i]); + gen8_free_page_tables(ppgtt->pdp.pagedir[i], ppgtt->base.dev); free_pd_single(ppgtt->pdp.pagedir[i]); } } @@ -596,7 +569,7 @@ static int gen8_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt) unwind_out: while (i--) - gen8_free_page_tables(ppgtt->pdp.pagedir[i]); + gen8_free_page_tables(ppgtt->pdp.pagedir[i], ppgtt->base.dev); return -ENOMEM; } @@ -694,18 +667,9 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt, uint64_t size) * 2. Create DMA mappings for the page directories and page tables. */ for (i = 0; i < max_pdp; i++) { - struct i915_pagedir *pd; ret = gen8_ppgtt_setup_page_directories(ppgtt, i); if (ret) goto bail; - - pd = ppgtt->pdp.pagedir[i]; - - for (j = 0; j < I915_PDES_PER_PD; j++) { - ret = dma_map_pt_single(pd->page_tables[j], ppgtt->base.dev); - if (ret) - goto bail; - } } /* @@ -1125,7 +1089,7 @@ static void gen6_ppgtt_free(struct i915_hw_ppgtt *ppgtt) int i; for (i = 0; i < ppgtt->num_pd_entries; i++) - free_pt_single(ppgtt->pd.page_tables[i]); + free_pt_single(ppgtt->pd.page_tables[i], ppgtt->base.dev); free_pd_single(&ppgtt->pd); } @@ -1139,7 +1103,6 @@ static void gen6_ppgtt_cleanup(struct i915_address_space *vm) drm_mm_takedown(&ppgtt->base.mm); drm_mm_remove_node(&ppgtt->node); - dma_unmap_pt_range(&ppgtt->pd, 0, ppgtt->num_pd_entries, vm->dev); gen6_ppgtt_free(ppgtt); } @@ -1224,13 +1187,6 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) if (ret) return ret; - ret = dma_map_pt_range(&ppgtt->pd, 0, ppgtt->num_pd_entries, - ppgtt->base.dev); - if (ret) { - gen6_ppgtt_free(ppgtt); - return ret; - } - ppgtt->base.clear_range = gen6_ppgtt_clear_range; ppgtt->base.insert_entries = gen6_ppgtt_insert_entries; ppgtt->base.cleanup = gen6_ppgtt_cleanup;