From patchwork Fri Mar 17 19:46:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9631505 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D463E602D6 for ; Fri, 17 Mar 2017 19:46:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C400128522 for ; Fri, 17 Mar 2017 19:46:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8E58285A1; Fri, 17 Mar 2017 19:46:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 70B8C28522 for ; Fri, 17 Mar 2017 19:46:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A490B6E384; Fri, 17 Mar 2017 19:46:56 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 650A16E21B for ; Fri, 17 Mar 2017 19:46:54 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u132so4837788wmg.1 for ; Fri, 17 Mar 2017 12:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XQioJcoUjWBKkfRQPB3q0GMHv/1jRHaoKBcwb6rSlw4=; b=qywhQMwxGCoAxZslTisp2Uryyrcwo2RWycy2iv32VSPXFsvrIcKDWVJW9pg1D+gMxc 3EyD/jxmkLaLEisOq24roEQLI+2eXEP3Xbl+WFWpAsxaN55aJ7Y4Bn6DvENSUYrxKkYb jeT4mvDcgzFrlNFWjrbcl0e0b9mrNnu19uhVSPJ8c8gL6LL8UACPGXPkE3Xh0YsRE9pc BrZ+Wjw7vZ4CXKZDr6uQvdKOBZ22W1TVb0s59+xGV7bx8WdKQtDq7UbewmHlAP5+xplS ZR+loD3vK4OAUoEHl3586OjjKW1S0xBrcTBX3zXO965PTuYC6ZjK2trzo9k1aWiOhAKi 5qMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=XQioJcoUjWBKkfRQPB3q0GMHv/1jRHaoKBcwb6rSlw4=; b=b6PyX9EpFLFukPUTlr3qT+syvSTjcAiv1M+VOZU2IemRQ8UZ8/pXSuU+rpmDeEExsk j9cJG0DfITQHCPz+QmpM9nQ0uZshAJAchEqae8ISJb3IA/nz3s2uDqIc84XTnbe9uKJE df1lbr6xlIepQWRnZOeySeS1N1DoBfHuawTyu+O3aEZRgzw8m8XpTqbWVsrH4OKCIs+/ Y4k2y7hhliB1wqOWehB79/hvMBvlISLdc6pg+6F6wi6LOiB5MueGQMto+T12SJWFVj3g 9GBt46IpCdy5lRLXtIMsvIqyZ2tjsy0GVMS2Suf2Bm5xMj5H8M1AZ9mjHzAW2ZBEA6HO iM7w== X-Gm-Message-State: AFeK/H3KENDFWYFMSxr7WFMIm/Eq3dNhWf+rxzhFHaO+A4TFpZzVZrAu2pypy7XXexz/0A== X-Received: by 10.28.232.138 with SMTP id f10mr4542201wmi.59.1489780012863; Fri, 17 Mar 2017 12:46:52 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id i203sm3745913wmf.12.2017.03.17.12.46.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 12:46:52 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2017 19:46:48 +0000 Message-Id: <20170317194648.12468-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170317194648.12468-1-chris@chris-wilson.co.uk> References: <20170317194648.12468-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Initialise i915_gem_object_create_from_data() directly 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-Virus-Scanned: ClamAV using ClamSMTP Use pagecache_write to avoid shmemfs clearing the pages prior to us immediately overwriting them with our data. Signed-off-by: Chris Wilson Reviewed-by: Matthew Auld --- drivers/gpu/drm/i915/i915_gem.c | 45 ++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 3492f8d27c32..58e1db77d70e 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4953,9 +4953,9 @@ i915_gem_object_create_from_data(struct drm_i915_private *dev_priv, const void *data, size_t size) { struct drm_i915_gem_object *obj; - struct sg_table *sg; - size_t bytes; - int ret; + struct file *file; + size_t offset; + int err; obj = i915_gem_object_create(dev_priv, round_up(size, PAGE_SIZE)); if (IS_ERR(obj)) @@ -4963,26 +4963,39 @@ i915_gem_object_create_from_data(struct drm_i915_private *dev_priv, GEM_BUG_ON(obj->base.write_domain != I915_GEM_DOMAIN_CPU); - ret = i915_gem_object_pin_pages(obj); - if (ret) - goto fail; + file = obj->base.filp; + offset = 0; + do { + unsigned int len = min_t(typeof(size), size, PAGE_SIZE); + struct page *page; + void *pgdata, *vaddr; - sg = obj->mm.pages; - bytes = sg_copy_from_buffer(sg->sgl, sg->nents, (void *)data, size); - obj->mm.dirty = true; /* Backing store is now out of date */ - i915_gem_object_unpin_pages(obj); + err = pagecache_write_begin(file, file->f_mapping, + offset, len, 0, + &page, &pgdata); + if (err < 0) + goto fail; - if (WARN_ON(bytes != size)) { - DRM_ERROR("Incomplete copy, wrote %zu of %zu", bytes, size); - ret = -EFAULT; - goto fail; - } + vaddr = kmap(page); + memcpy(vaddr, data, len); + kunmap(page); + + err = pagecache_write_end(file, file->f_mapping, + offset, len, len, + page, pgdata); + if (err < 0) + goto fail; + + size -= len; + data += len; + offset += len; + } while (size); return obj; fail: i915_gem_object_put(obj); - return ERR_PTR(ret); + return ERR_PTR(err); } struct scatterlist *