From patchwork Thu Jan 2 08:49:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 11315495 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 60851139A for ; Thu, 2 Jan 2020 08:50:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4763D20866 for ; Thu, 2 Jan 2020 08:50:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4763D20866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43A7189CF9; Thu, 2 Jan 2020 08:50:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id D6D7C89CF9 for ; Thu, 2 Jan 2020 08:49:58 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 19746400-1500050 for multiple; Thu, 02 Jan 2020 08:49:51 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 2 Jan 2020 08:49:49 +0000 Message-Id: <20200102084949.1101288-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.25.0.rc0 In-Reply-To: <20200101220927.1074805-1-chris@chris-wilson.co.uk> References: <20200101220927.1074805-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/gem: Support discontiguous lmem object maps X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Auld Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Create a vmap for discontinguous lmem objects to support i915_gem_object_pin_map(). Signed-off-by: Chris Wilson Cc: Matthew Auld --- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 46 ++++++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c index 75197ca696a8..288b0e84c891 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -158,10 +158,10 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj) static void unmap_object(struct drm_i915_gem_object *obj, void *ptr) { - if (i915_gem_object_is_lmem(obj)) - io_mapping_unmap((void __force __iomem *)ptr); - else if (is_vmalloc_addr(ptr)) + if (is_vmalloc_addr(ptr)) vunmap(ptr); + else if (i915_gem_object_is_lmem(obj)) + io_mapping_unmap((void __force __iomem *)ptr); else kunmap(kmap_to_page(ptr)); } @@ -236,6 +236,12 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj) return err; } +static inline pte_t iomap_wc_pte(resource_size_t base, dma_addr_t offset) +{ + return pte_mkspecial(pfn_pte((base + offset) >> PAGE_SHIFT, + pgprot_writecombine(PAGE_KERNEL))); +} + /* The 'mapping' part of i915_gem_object_pin_map() below */ static void *i915_gem_object_map(struct drm_i915_gem_object *obj, enum i915_map_type type) @@ -251,13 +257,41 @@ static void *i915_gem_object_map(struct drm_i915_gem_object *obj, void *addr; if (i915_gem_object_is_lmem(obj)) { - void __iomem *io; + const resource_size_t iomap = obj->mm.region->iomap.base; + struct vm_struct *area; + dma_addr_t addr; + pte_t **ptes; + void *mem; if (type != I915_MAP_WC) return NULL; - io = i915_gem_object_lmem_io_map(obj, 0, obj->base.size); - return (void __force *)io; + if (i915_gem_object_is_contiguous(obj)) { + void __iomem *io = + i915_gem_object_lmem_io_map(obj, + 0, obj->base.size); + + return (void __force *)io; + } + + mem = kvmalloc_array(obj->base.size >> PAGE_SHIFT, + sizeof(*ptes), + GFP_KERNEL); + if (!mem) + return NULL; + + area = alloc_vm_area(obj->base.size, mem); + if (!area) { + kvfree(mem); + return NULL; + } + + ptes = mem; + for_each_sgt_daddr(addr, sgt_iter, sgt) + **ptes++ = iomap_wc_pte(iomap, addr); + kvfree(mem); + + return area->addr; } /* A single page can always be kmapped */