From: Christoph Hellwig <hch@lst.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Chris Wilson <chris@chris-wilson.co.uk>,
Matthew Auld <matthew.auld@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Minchan Kim <minchan@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
Nitin Gupta <ngupta@vflare.org>,
x86@kernel.org, xen-devel@lists.xenproject.org,
linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-mm@kvack.org
Subject: [PATCH 07/11] drm/i915: stop using kmap in i915_gem_object_map
Date: Thu, 24 Sep 2020 15:58:49 +0200 [thread overview]
Message-ID: <20200924135853.875294-8-hch@lst.de> (raw)
In-Reply-To: <20200924135853.875294-1-hch@lst.de>
kmap for !PageHighmem is just a convoluted way to say page_address,
and kunmap is a no-op in that case.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 7 ++-----
1 file changed, 2 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 d6eeefab3d018b..6550c0bc824ea2 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -162,8 +162,6 @@ static void unmap_object(struct drm_i915_gem_object *obj, void *ptr)
{
if (is_vmalloc_addr(ptr))
vunmap(ptr);
- else
- kunmap(kmap_to_page(ptr));
}
struct sg_table *
@@ -277,11 +275,10 @@ static void *i915_gem_object_map(struct drm_i915_gem_object *obj,
* forever.
*
* So if the page is beyond the 32b boundary, make an explicit
- * vmap. On 64b, this check will be optimised away as we can
- * directly kmap any page on the system.
+ * vmap.
*/
if (!PageHighMem(page))
- return kmap(page);
+ return page_address(page);
}
mem = stack;
--
2.28.0
next prev parent reply other threads:[~2020-09-24 13:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 13:58 remove alloc_vm_area v2 Christoph Hellwig
2020-09-24 13:58 ` [PATCH 01/11] mm: update the documentation for vfree Christoph Hellwig
2020-09-24 13:58 ` [PATCH 02/11] mm: add a VM_MAP_PUT_PAGES flag for vmap Christoph Hellwig
2020-09-24 13:58 ` [PATCH 03/11] mm: add a vmap_pfn function Christoph Hellwig
2020-09-24 13:58 ` [PATCH 04/11] mm: allow a NULL fn callback in apply_to_page_range Christoph Hellwig
2020-09-24 13:58 ` [PATCH 05/11] zsmalloc: switch from alloc_vm_area to get_vm_area Christoph Hellwig
2020-09-24 13:58 ` [PATCH 06/11] drm/i915: use vmap in shmem_pin_map Christoph Hellwig
2020-09-25 13:05 ` Tvrtko Ursulin
2020-09-24 13:58 ` Christoph Hellwig [this message]
2020-09-25 13:01 ` [PATCH 07/11] drm/i915: stop using kmap in i915_gem_object_map Tvrtko Ursulin
2020-09-24 13:58 ` [PATCH 08/11] drm/i915: use vmap " Christoph Hellwig
2020-09-25 13:11 ` Tvrtko Ursulin
2020-09-25 14:08 ` [Intel-gfx] " Matthew Auld
2020-09-25 16:02 ` Christoph Hellwig
2020-09-25 16:09 ` [PATCH 08/11, fixed] " Christoph Hellwig
2020-09-24 13:58 ` [PATCH 09/11] xen/xenbus: use apply_to_page_range directly in xenbus_map_ring_pv Christoph Hellwig
2020-09-24 23:42 ` boris.ostrovsky
2020-09-24 13:58 ` [PATCH 10/11] x86/xen: open code alloc_vm_area in arch_gnttab_valloc Christoph Hellwig
2020-09-24 23:43 ` boris.ostrovsky
2020-09-24 13:58 ` [PATCH 11/11] mm: remove alloc_vm_area Christoph Hellwig
2020-09-26 2:43 ` remove alloc_vm_area v2 Andrew Morton
2020-09-26 6:29 ` Christoph Hellwig
2020-09-28 10:13 ` Joonas Lahtinen
2020-09-28 12:37 ` Christoph Hellwig
2020-09-29 12:43 ` Joonas Lahtinen
2020-09-30 14:48 ` Christoph Hellwig
2020-09-30 18:37 ` Daniel Vetter
2020-10-02 12:21 remove alloc_vm_area v4 Christoph Hellwig
2020-10-02 12:22 ` [PATCH 07/11] drm/i915: stop using kmap in i915_gem_object_map Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200924135853.875294-8-hch@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=boris.ostrovsky@oracle.com \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jgross@suse.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=matthew.auld@intel.com \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=peterz@infradead.org \
--cc=rodrigo.vivi@intel.com \
--cc=sstabellini@kernel.org \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).