From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 030BBC433DF for ; Fri, 21 Aug 2020 08:50:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A3F2322D03 for ; Fri, 21 Aug 2020 08:50:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3F2322D03 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 532046B00A3; Fri, 21 Aug 2020 04:50:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BB2F8D0005; Fri, 21 Aug 2020 04:50:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D2126B00A5; Fri, 21 Aug 2020 04:50:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0121.hostedemail.com [216.40.44.121]) by kanga.kvack.org (Postfix) with ESMTP id 23CB86B00A3 for ; Fri, 21 Aug 2020 04:50:31 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D9544824556B for ; Fri, 21 Aug 2020 08:50:30 +0000 (UTC) X-FDA: 77173954620.15.frog39_3417dbc27037 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 890CA1814B0C8 for ; Fri, 21 Aug 2020 08:50:30 +0000 (UTC) X-HE-Tag: frog39_3417dbc27037 X-Filterd-Recvd-Size: 2983 Received: from fireflyinternet.com (unknown [77.68.26.236]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Fri, 21 Aug 2020 08:50:29 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from build.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 22195099-1500050 for multiple; Fri, 21 Aug 2020 09:50:15 +0100 From: Chris Wilson To: linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org Cc: linux-mm@kvack.org, Chris Wilson , Matthew Auld Subject: [PATCH 3/4] drm/i915/gem: Use set_pte_at() for assigning the vmapped PTE Date: Fri, 21 Aug 2020 09:50:10 +0100 Message-Id: <20200821085011.28878-3-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200821085011.28878-1-chris@chris-wilson.co.uk> References: <20200821085011.28878-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 X-Rspamd-Queue-Id: 890CA1814B0C8 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Use set_pte_at() to assign the PTE pointer returned by alloc_vm_area(), rather than a direct assignment. Fixes: 6056e50033d9 ("drm/i915/gem: Support discontiguous lmem object map= s") Signed-off-by: Chris Wilson Cc: Matthew Auld --- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/= i915/gem/i915_gem_pages.c index 0fee67f34d74..6838cf9bdae6 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -286,23 +286,34 @@ static void *i915_gem_object_map(struct drm_i915_ge= m_object *obj, } =20 if (i915_gem_object_has_struct_page(obj)) { + unsigned long addr =3D (unsigned long)area->addr; struct sgt_iter iter; struct page *page; pte_t **ptes =3D mem; =20 - for_each_sgt_page(page, iter, sgt) - **ptes++ =3D mk_pte(page, pgprot); + for_each_sgt_page(page, iter, sgt) { + set_pte_at(&init_mm, addr, *ptes, mk_pte(page, pgprot)); + addr +=3D PAGE_SIZE; + ptes++; + } + GEM_BUG_ON(addr !=3D (unsigned long)area->addr + obj->base.size); } else { + unsigned long addr =3D (unsigned long)area->addr; resource_size_t iomap; struct sgt_iter iter; pte_t **ptes =3D mem; - dma_addr_t addr; + dma_addr_t offset; =20 iomap =3D obj->mm.region->iomap.base; iomap -=3D obj->mm.region->region.start; =20 - for_each_sgt_daddr(addr, iter, sgt) - **ptes++ =3D iomap_pte(iomap, addr, pgprot); + for_each_sgt_daddr(offset, iter, sgt) { + set_pte_at(&init_mm, addr, *ptes, + iomap_pte(iomap, offset, pgprot)); + addr +=3D PAGE_SIZE; + ptes++; + } + GEM_BUG_ON(addr !=3D (unsigned long)area->addr + obj->base.size); } flush_vm_area(area); =20 --=20 2.20.1