Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Gerd Hoffmann <kraxel@redhat.com>
To:     dri-devel@lists.freedesktop.org
Cc:     robh@kernel.org, intel-gfx@lists.freedesktop.org,
        Gerd Hoffmann <kraxel@redhat.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Christian Koenig <christian.koenig@amd.com>,
        Huang Rui <ray.huang@amd.com>,
        linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v3 1/2] drm: call drm_gem_object_funcs.mmap with fake offset
Date:   Wed, 27 Nov 2019 10:25:22 +0100
Message-Id: <20191127092523.5620-2-kraxel@redhat.com>
In-Reply-To: <20191127092523.5620-1-kraxel@redhat.com>
References: <20191127092523.5620-1-kraxel@redhat.com>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

The fake offset is going to stay, so change the calling convention for
drm_gem_object_funcs.mmap to include the fake offset.  Update all users
accordingly.

Note that this reverts 83b8a6f242ea ("drm/gem: Fix mmap fake offset
handling for drm_gem_object_funcs.mmap") and on top then adds the fake
offset to  drm_gem_prime_mmap to make sure all paths leading to
obj->funcs->mmap are consistent.

v3: move fake-offset tweak in drm_gem_prime_mmap() so we have this code
    only once in the function (Rob Herring).

Fixes: 83b8a6f242ea ("drm/gem: Fix mmap fake offset handling for drm_gem_ob=
ject_funcs.mmap")
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 include/drm/drm_gem.h                  | 4 +---
 drivers/gpu/drm/drm_gem.c              | 3 ---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +++
 drivers/gpu/drm/drm_prime.c            | 5 +++--
 drivers/gpu/drm/ttm/ttm_bo_vm.c        | 7 -------
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 97a48165642c..0b375069cd48 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -159,9 +159,7 @@ struct drm_gem_object_funcs {
 =09 *
 =09 * The callback is used by by both drm_gem_mmap_obj() and
 =09 * drm_gem_prime_mmap().  When @mmap is present @vm_ops is not
-=09 * used, the @mmap callback must set vma->vm_ops instead. The @mmap
-=09 * callback is always called with a 0 offset. The caller will remove
-=09 * the fake offset as necessary.
+=09 * used, the @mmap callback must set vma->vm_ops instead.
 =09 */
 =09int (*mmap)(struct drm_gem_object *obj, struct vm_area_struct *vma);
=20
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 2f2b889096b0..56f42e0f2584 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -1106,9 +1106,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsi=
gned long obj_size,
 =09=09return -EINVAL;
=20
 =09if (obj->funcs && obj->funcs->mmap) {
-=09=09/* Remove the fake offset */
-=09=09vma->vm_pgoff -=3D drm_vma_node_start(&obj->vma_node);
-
 =09=09ret =3D obj->funcs->mmap(obj, vma);
 =09=09if (ret)
 =09=09=09return ret;
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_g=
em_shmem_helper.c
index 0810d3ef6961..a421a2eed48a 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -528,6 +528,9 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, stru=
ct vm_area_struct *vma)
 =09struct drm_gem_shmem_object *shmem;
 =09int ret;
=20
+=09/* Remove the fake offset */
+=09vma->vm_pgoff -=3D drm_vma_node_start(&obj->vma_node);
+
 =09shmem =3D to_drm_gem_shmem_obj(obj);
=20
 =09ret =3D drm_gem_shmem_get_pages(shmem);
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 0814211b0f3f..a0f929c7117b 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -713,6 +713,9 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, stru=
ct vm_area_struct *vma)
 =09struct file *fil;
 =09int ret;
=20
+=09/* Add the fake offset */
+=09vma->vm_pgoff +=3D drm_vma_node_start(&obj->vma_node);
+
 =09if (obj->funcs && obj->funcs->mmap) {
 =09=09ret =3D obj->funcs->mmap(obj, vma);
 =09=09if (ret)
@@ -737,8 +740,6 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, stru=
ct vm_area_struct *vma)
 =09if (ret)
 =09=09goto out;
=20
-=09vma->vm_pgoff +=3D drm_vma_node_start(&obj->vma_node);
-
 =09ret =3D obj->dev->driver->fops->mmap(fil, vma);
=20
 =09drm_vma_node_revoke(&obj->vma_node, priv);
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_v=
m.c
index e6495ca2630b..3e8c3de91ae4 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -514,13 +514,6 @@ EXPORT_SYMBOL(ttm_bo_mmap);
 int ttm_bo_mmap_obj(struct vm_area_struct *vma, struct ttm_buffer_object *=
bo)
 {
 =09ttm_bo_get(bo);
-
-=09/*
-=09 * FIXME: &drm_gem_object_funcs.mmap is called with the fake offset
-=09 * removed. Add it back here until the rest of TTM works without it.
-=09 */
-=09vma->vm_pgoff +=3D drm_vma_node_start(&bo->base.vma_node);
-
 =09ttm_bo_mmap_vma_setup(bo, vma);
 =09return 0;
 }
--=20
2.18.1