From patchwork Mon Jan 11 11:01:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8002441 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D5E789FCC4 for ; Mon, 11 Jan 2016 11:04:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C2412035B for ; Mon, 11 Jan 2016 11:04:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BC5CB20303 for ; Mon, 11 Jan 2016 11:04:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C56006E4A0; Mon, 11 Jan 2016 03:04:06 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9BAC66E475 for ; Mon, 11 Jan 2016 03:02:35 -0800 (PST) Received: by mail-wm0-f65.google.com with SMTP id u188so25686163wmu.0 for ; Mon, 11 Jan 2016 03:02:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=33dfhaCXekmS6xKfK1gJ+G5T3W4J2eOcBMUXpiafjEc=; b=UxR13j5dC8tusB/GSRWssQbos94Pr9KfOr5kxPhCnXGoeBylDij++ivmyr/0c+BtVv kk3/KQ7OWbWEINZACUkCaO3mRFWFLOBEHkHJq4JhCaxWHE+PyScdkU3s3/voGj53xIdx ImAYSleVbFI1wQfII0EnHq/yOGN63RNDZ8EGObMS+2qBPFggQurMOpyvzYD3XuUwq1YW +aS+LHS9coksE1UgJq0JqHG92lnmOCdN5OZmU0bUOsYEluGE5mluCSQC9s6t1Wc9DAD/ vzqA1/iwiVZilUrpDSDJGi9wg0jxLeRK/OPHUZdsYrozIO+3NkkqTUFqC8ogXdnM+sud UchQ== X-Received: by 10.28.15.210 with SMTP id 201mr12214159wmp.79.1452510154399; Mon, 11 Jan 2016 03:02:34 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 73sm12311579wmm.7.2016.01.11.03.02.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 03:02:33 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 11:01:25 +0000 Message-Id: <1452510091-6833-43-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1452510091-6833-1-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> <1452510091-6833-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 184/190] drm/i915/cmdparser: Only cache the dst vmap X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 For simplicity, we want to continue using a contiguous mapping of the command buffer, but we can reduce the number of vmappings we hold by switching over to a page-by-page copy from the user batch buffer to the shadow. The cost for saving one linear mapping is about 5% in trivial workloads - which is more or less the overhead in calling kmap_atomic(). Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_cmd_parser.c | 35 +++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index 32b83369ae4e..05221581887e 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -875,7 +875,8 @@ static u32 *copy_batch(struct drm_i915_gem_object *dst_obj, { unsigned src_needs_clflush; unsigned dst_needs_clflush; - void *src, *dst; + void *dst, *ptr; + int offset, n; int ret; ret = i915_gem_obj_prepare_shmem_read(src_obj, &src_needs_clflush); @@ -888,30 +889,34 @@ static u32 *copy_batch(struct drm_i915_gem_object *dst_obj, goto unpin_src; } - src = i915_gem_object_pin_vmap(src_obj); - if (IS_ERR(src)) { - dst = src; - goto unpin_dst; - } - dst = i915_gem_object_pin_vmap(dst_obj); if (IS_ERR(dst)) - goto unmap_src; - - src += batch_start_offset; - if (src_needs_clflush) - clflush_cache_range(src, batch_len); + goto unpin_dst; + ptr = dst; + offset = offset_in_page(batch_start_offset); if (dst_needs_clflush & CLFLUSH_BEFORE) batch_len = roundup(batch_len, boot_cpu_data.x86_clflush_size); - memcpy(dst, src, batch_len); + for (n = batch_start_offset >> PAGE_SHIFT; batch_len; n++) { + int len = min_t(int, batch_len, PAGE_SIZE - offset); + void *vaddr; + + offset = 0; + batch_len -= len; + + vaddr = kmap_atomic(i915_gem_object_get_page(src_obj, n)); + if (src_needs_clflush) + clflush_cache_range(vaddr + offset, len); + memcpy(ptr, vaddr + offset, len); + kunmap_atomic(vaddr); + + ptr += len; + } /* dst_obj is returned with vmap pinned */ *needs_clflush_after = dst_needs_clflush & CLFLUSH_AFTER; -unmap_src: - i915_gem_object_unpin_vmap(src_obj); unpin_dst: i915_gem_object_unpin_pages(dst_obj); unpin_src: