From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com [209.85.192.169]) by kanga.kvack.org (Postfix) with ESMTP id 4E88D6B0032 for ; Thu, 9 Apr 2015 04:00:57 -0400 (EDT) Received: by pdea3 with SMTP id a3so144587182pde.3 for ; Thu, 09 Apr 2015 01:00:57 -0700 (PDT) Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTP id t5si20360286pda.72.2015.04.09.01.00.56 for ; Thu, 09 Apr 2015 01:00:56 -0700 (PDT) Message-ID: <1428566436.2910.25.camel@jlahtine-mobl1> Subject: Re: [PATCH 5/5] drm/i915: Use remap_io_mapping() to prefault all PTE in a single pass From: Joonas Lahtinen Date: Thu, 09 Apr 2015 11:00:36 +0300 In-Reply-To: <1428424299-13721-6-git-send-email-chris@chris-wilson.co.uk> References: <1428424299-13721-1-git-send-email-chris@chris-wilson.co.uk> <1428424299-13721-6-git-send-email-chris@chris-wilson.co.uk> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org, linux-mm@kvack.org On ti, 2015-04-07 at 17:31 +0100, Chris Wilson wrote: > On an Ivybridge i7-3720qm with 1600MHz DDR3, with 32 fences, > Upload rate for 2 linear surfaces: 8134MiB/s -> 8154MiB/s > Upload rate for 2 tiled surfaces: 8625MiB/s -> 8632MiB/s > Upload rate for 4 linear surfaces: 8127MiB/s -> 8134MiB/s > Upload rate for 4 tiled surfaces: 8602MiB/s -> 8629MiB/s > Upload rate for 8 linear surfaces: 8124MiB/s -> 8137MiB/s > Upload rate for 8 tiled surfaces: 8603MiB/s -> 8624MiB/s > Upload rate for 16 linear surfaces: 8123MiB/s -> 8128MiB/s > Upload rate for 16 tiled surfaces: 8606MiB/s -> 8618MiB/s > Upload rate for 32 linear surfaces: 8121MiB/s -> 8128MiB/s > Upload rate for 32 tiled surfaces: 8605MiB/s -> 8614MiB/s > Upload rate for 64 linear surfaces: 8121MiB/s -> 8127MiB/s > Upload rate for 64 tiled surfaces: 3017MiB/s -> 5202MiB/s > > Signed-off-by: Chris Wilson > Testcase: igt/gem_fence_upload/performance > Testcase: igt/gem_mmap_gtt > Reviewed-by: Brad Volkin Reviewed-by: Joonas Lahtinen > Cc: linux-mm@kvack.org > --- > drivers/gpu/drm/i915/i915_gem.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 7ab8e0039790..90d772f72276 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1667,25 +1667,14 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) > pfn = dev_priv->gtt.mappable_base + i915_gem_obj_ggtt_offset(obj); > pfn >>= PAGE_SHIFT; > > - if (!obj->fault_mappable) { > - unsigned long size = min_t(unsigned long, > - vma->vm_end - vma->vm_start, > - obj->base.size); > - int i; > + ret = remap_io_mapping(vma, > + vma->vm_start, pfn, vma->vm_end - vma->vm_start, > + dev_priv->gtt.mappable); > + if (ret) > + goto unpin; > > - for (i = 0; i < size >> PAGE_SHIFT; i++) { > - ret = vm_insert_pfn(vma, > - (unsigned long)vma->vm_start + i * PAGE_SIZE, > - pfn + i); > - if (ret) > - break; > - } > + obj->fault_mappable = true; > > - obj->fault_mappable = true; > - } else > - ret = vm_insert_pfn(vma, > - (unsigned long)vmf->virtual_address, > - pfn + page_offset); > unpin: > i915_gem_object_ggtt_unpin(obj); > unlock: -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org