Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1575480

[PATCH v2 6/7] drm/rockchip: Respect page offset in IOMMU mmap

Show all headers | View raw

From: Ørjan Eide <orjan.eide@arm.com>

When mapping buffers through the PRIME DMA-buf mmap path we might be
given an offset which has to be respected. The DRM GEM mmap path already
takes care of zeroing out the fake mmap offset, so we can just make the
IOMMU mmap implementation always respect the offset.

TEST=graphics_GLBench

Signed-off-by: rjan Eide <orjan.eide@arm.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/386477
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 1daa531..1769146 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -221,12 +221,16 @@ static int rockchip_drm_gem_object_mmap_iommu(struct drm_gem_object *obj,
 	unsigned int i, count = obj->size >> PAGE_SHIFT;
 	unsigned long user_count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 	unsigned long uaddr = vma->vm_start;
+	unsigned long offset = vma->vm_pgoff;
+	unsigned long end = user_count + offset;
 	int ret;
 
-	if (user_count == 0 || user_count > count)
+	if (user_count == 0)
+		return -ENXIO;
+	if (end > count)
 		return -ENXIO;
 
-	for (i = 0; i < user_count; i++) {
+	for (i = offset; i < end; i++) {
 		ret = vm_insert_page(vma, uaddr, rk_obj->pages[i]);
 		if (ret)
 			return ret;
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64 iommu Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
  [PATCH v2 6/7] drm/rockchip: Respect page offset in IOMMU mmap Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
    Re: [PATCH v2 6/7] drm/rockchip: Respect page offset in IOMMU mmap Thierry Reding <thierry.reding@gmail.com> - 2017-02-07 13:40 +0100
  [PATCH v2 1/7] drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
  [PATCH v2 7/7] drm/rockchip: Call drm_gem_object_release() to destroy GEM base Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
    Re: [PATCH v2 7/7] drm/rockchip: Call drm_gem_object_release() to  destroy GEM base Thierry Reding <thierry.reding@gmail.com> - 2017-02-07 13:40 +0100
      Re: [PATCH v2 7/7] drm/rockchip: Call drm_gem_object_release() to  destroy GEM base Tomasz Figa <tfiga@chromium.org> - 2017-02-07 14:10 +0100
  Re: [PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64  iommu Thierry Reding <thierry.reding@gmail.com> - 2017-02-07 13:40 +0100
    Re: [PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64  iommu Mark yao <mark.yao@rock-chips.com> - 2017-02-08 02:20 +0100
  Re: [PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64 iommu Heiko Stübner <heiko@sntech.de> - 2017-02-09 00:40 +0100

csiph-web