From patchwork Fri Mar 17 22:57:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9631723 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 2220E602D6 for ; Fri, 17 Mar 2017 22:58:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F4AB2756B for ; Fri, 17 Mar 2017 22:58:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0469028593; Fri, 17 Mar 2017 22:58:02 +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 B570B2756B for ; Fri, 17 Mar 2017 22:58:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A83316EDDB; Fri, 17 Mar 2017 22:57:59 +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 58D8B6EDD4 for ; Fri, 17 Mar 2017 22:57:57 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id z133so5385664wmb.2 for ; Fri, 17 Mar 2017 15:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=22QR+4qveYZra6KsG/HsKqV+z224PeE1qMJ7aBNXDk8=; b=Q7zxgBlQEmXuGVn8LI2P5q59t49cwycxjup0dZ5PGAtbDq0E38pN7Sl+lKSJ2q5hZp nizAMn6t4kbKf0bDf1ozhTKxwnDYbQSuL+ws6doZsT3JWHNXpi6Eri3Tik5UFc5tlzQ8 2XQck3K+FomT/Hy9FyUnrBDzRL1GkQSvUH09kE2bm1yyl5zVcIfge4uD1hmziEuuijC6 zEAQj2BxvXMz7S9IwmznP1yqydno7VA1h7PQL/h+kBY6VOXEcPcMlDsf3OZaycMV8jWS /9hNKyQCh310FTJLbmpYlYJfl4QBwVxLRpq+Ct2iZvxw6Dm59QHfDmI5zJcS1IEek8yc AVDA== 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:subject:date:message-id :in-reply-to:references; bh=22QR+4qveYZra6KsG/HsKqV+z224PeE1qMJ7aBNXDk8=; b=GRdqr58GKWJzCqHLijaj0Vivc1vBtRmg8UMaxOZSF4RmOZ1Tnc3NUgK41of8MjDUdM slrnFqNijvjTpxz2Nro8yuqOGVYmvZ4XBIlXA/jbqCHbGSVrvN0Fnqh6+hSI4TxPwf62 UviUWyC8hHQTlnZaZQSJ94JyA6bZ6xnnYqyUROtHCYy1EBO2NU05XWJPuC3jetMdtH89 kOPpU7ZGlnjesbYuaMHOQdusiBW4Shp1aSyTUjb3Da6ibQjnZA4YTAMQmIwhSe29fd3C Wpw8e5d6i9CH7Kgew0G5b84+/b87zm2N9PWOz0RiGCaS/JJZ8mJPBYXXVyZg56SKbRHF ZPrA== X-Gm-Message-State: AFeK/H2UOIinv2Ty4flQwQa4qe1soVkfy+IHv98lh6+wu87U9xFCI3nsRuj/vI9g8weprg== X-Received: by 10.28.17.11 with SMTP id 11mr445819wmr.32.1489791475510; Fri, 17 Mar 2017 15:57:55 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id o143sm4227780wmd.3.2017.03.17.15.57.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 15:57:54 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2017 22:57:51 +0000 Message-Id: <20170317225752.11014-3-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170317225752.11014-1-chris@chris-wilson.co.uk> References: <20170317225752.11014-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 3/4] 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 Link: http://patchwork.freedesktop.org/patch/msgid/20170317194648.12468-2-chris@chris-wilson.co.uk 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 *