From patchwork Fri Aug 22 03:12:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 4760781 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 590E99F377 for ; Fri, 22 Aug 2014 03:13:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BDC820155 for ; Fri, 22 Aug 2014 03:13:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 53EE5201C8 for ; Fri, 22 Aug 2014 03:13:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 118586E86A; Thu, 21 Aug 2014 20:13:33 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id A45D96E862 for ; Thu, 21 Aug 2014 20:13:31 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 21 Aug 2014 20:05:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="375575992" Received: from unknown (HELO ironside.intel.com) ([10.255.12.192]) by FMSMGA003.fm.intel.com with ESMTP; 21 Aug 2014 20:09:38 -0700 From: Ben Widawsky To: Intel GFX Date: Thu, 21 Aug 2014 20:12:02 -0700 Message-Id: <1408677155-1840-40-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1408677155-1840-1-git-send-email-benjamin.widawsky@intel.com> References: <1408677155-1840-1-git-send-email-benjamin.widawsky@intel.com> Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH 39/68] drm/i915: Consolidate dma mappings 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-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With a little bit of macro magic, and the fact that every page table/dir/etc. we wish to map will have a page, and daddr member, we can greatly simplify and reduce code. The patch introduces an i915_dma_map/unmap which has the same semantics as pci_map_page, but is 1 line, and doesn't require newlines, or local variables to make it fit cleanly. Notice that even the page allocation shares this same attribute. For now, I am leaving that code untouched because the macro version would be a bit on the big side - but it's a nice cleanup as well (IMO) Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_gtt.c | 56 ++++++++++++------------------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 2346cb7..205d5c6 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -203,45 +203,33 @@ static gen6_gtt_pte_t iris_pte_encode(dma_addr_t addr, return pte; } -#define dma_unmap_pt_single(pt, dev) do { \ - pci_unmap_page((dev)->pdev, (pt)->daddr, 4096, PCI_DMA_BIDIRECTIONAL); \ +#define i915_dma_unmap_single(px, dev) do { \ + pci_unmap_page((dev)->pdev, (px)->daddr, 4096, PCI_DMA_BIDIRECTIONAL); \ } while (0); /** - * dma_map_pt_single() - Create a dma mapping for a page table - * @pt: Page table to get a DMA map for + * i915_dma_map_px_single() - Create a dma mapping for a page table/dir/etc. + * @px: Page table/dir/etc to get a DMA map for * @dev: drm device * * Page table allocations are unified across all gens. They always require a - * single 4k allocation, as well as a DMA mapping. + * single 4k allocation, as well as a DMA mapping. If we keep the structs + * symmetric here, the simple macro covers us for every page table type. * * Return: 0 if success. */ -static int dma_map_pt_single(struct i915_pagetab *pt, struct drm_device *dev) -{ - struct page *page; - dma_addr_t pt_addr; - int ret; - - page = pt->page; - pt_addr = pci_map_page(dev->pdev, page, 0, 4096, - PCI_DMA_BIDIRECTIONAL); - - ret = pci_dma_mapping_error(dev->pdev, pt_addr); - if (ret) - return ret; - - pt->daddr = pt_addr; - - return 0; -} +#define i915_dma_map_px_single(px, dev) \ + pci_dma_mapping_error((dev)->pdev, \ + (px)->daddr = pci_map_page((dev)->pdev, \ + (px)->page, 0, 4096, \ + PCI_DMA_BIDIRECTIONAL)) 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); + i915_dma_unmap_single(pt, dev); __free_page(pt->page); kfree(pt); } @@ -261,7 +249,7 @@ static struct i915_pagetab *alloc_pt_single(struct drm_device *dev) return ERR_PTR(-ENOMEM); } - ret = dma_map_pt_single(pt, dev); + ret = i915_dma_map_px_single(pt, dev); if (ret) { __free_page(pt->page); kfree(pt); @@ -511,7 +499,7 @@ static void gen8_ppgtt_free(struct i915_hw_ppgtt *ppgtt) static void gen8_ppgtt_dma_unmap_pages(struct i915_hw_ppgtt *ppgtt) { - struct pci_dev *hwdev = ppgtt->base.dev->pdev; + struct drm_device *dev = ppgtt->base.dev; int i, j; for (i = 0; i < ppgtt->num_pd_pages; i++) { @@ -520,16 +508,14 @@ static void gen8_ppgtt_dma_unmap_pages(struct i915_hw_ppgtt *ppgtt) if (!ppgtt->pdp.pagedir[i]->daddr) continue; - pci_unmap_page(hwdev, ppgtt->pdp.pagedir[i]->daddr, PAGE_SIZE, - PCI_DMA_BIDIRECTIONAL); + i915_dma_unmap_single(ppgtt->pdp.pagedir[i], dev); for (j = 0; j < I915_PDES_PER_PD; j++) { struct i915_pagedir *pd = ppgtt->pdp.pagedir[i]; struct i915_pagetab *pt = pd->page_tables[j]; dma_addr_t addr = pt->daddr; if (addr) - pci_unmap_page(hwdev, addr, PAGE_SIZE, - PCI_DMA_BIDIRECTIONAL); + i915_dma_unmap_single(pt, dev); } } } @@ -615,19 +601,13 @@ err_out: static int gen8_ppgtt_setup_page_directories(struct i915_hw_ppgtt *ppgtt, const int pdpe) { - dma_addr_t pd_addr; int ret; - pd_addr = pci_map_page(ppgtt->base.dev->pdev, - ppgtt->pdp.pagedir[pdpe]->page, 0, - PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); - - ret = pci_dma_mapping_error(ppgtt->base.dev->pdev, pd_addr); + ret = i915_dma_map_px_single(ppgtt->pdp.pagedir[pdpe], + ppgtt->base.dev); if (ret) return ret; - ppgtt->pdp.pagedir[pdpe]->daddr = pd_addr; - return 0; }