Skip to contentSkip to conversation

drm/panfrost: Revert drm_gem_map_offset changes

PATCH Applied Sean Paul 4 participants 9 messages Aug 7, 2019

Subsystems (5)
lore
Share & tools
lore

Sean Paul

author
#0 lore raw

cover drm/panfrost: Revert drm_gem_map_offset changes

From: Sean Paul <[email protected]>

When I started re-applying these I realized they hadn't hit the list.

Sean

Rob Herring (2):
Revert "drm/gem: Rename drm_gem_dumb_map_offset() to

    drm_gem_map_offset()"

Revert "drm/panfrost: Use drm_gem_map_offset()"

 drivers/gpu/drm/drm_dumb_buffers.c      |  4 ++--
 drivers/gpu/drm/drm_gem.c               | 10 +++-------
 drivers/gpu/drm/exynos/exynos_drm_gem.c |  3 ++-
 drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++++++++++++++--
 include/drm/drm_gem.h                   |  4 ++--
 5 files changed, 23 insertions(+), 14 deletions(-)
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#1 lore raw

PATCH 1/2 Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()"

From: Rob Herring <[email protected]>

This reverts commit 220df83a5394fbf7c1486ba7848794b7b351d598.

Turns out drm_gem_dumb_map_offset really only worked for the dumb buffer case, so revert the name change.

---
 drivers/gpu/drm/drm_dumb_buffers.c      |  4 ++--
 drivers/gpu/drm/drm_gem.c               | 10 +++-------
 drivers/gpu/drm/exynos/exynos_drm_gem.c |  3 ++-
 include/drm/drm_gem.h                   |  4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_dumb_buffers.c +2 -2
index b55cfc9e8772..d18a740fe0f1 100644
@@ -48,7 +48,7 @@
  * To support dumb objects drivers must implement the &drm_driver.dumb_create
  * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if
  * not set and &drm_driver.dumb_map_offset defaults to
- * drm_gem_map_offset(). See the callbacks for further details.
+ * drm_gem_dumb_map_offset(). See the callbacks for further details.
  *
  * Note that dumb objects may not be used for gpu acceleration, as has been
  * attempted on some ARM embedded platforms. Such drivers really must have
@@ -127,7 +127,7 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev,
 						    args->handle,
 						    &args->offset);
 	else
-		return drm_gem_map_offset(file_priv, dev, args->handle,
+		return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
 					       &args->offset);
 }
 
drivers/gpu/drm/drm_gem.c +3 -7
index 8cbfd60e09c0..afc38cece3f5 100644
@@ -298,7 +298,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
 EXPORT_SYMBOL(drm_gem_handle_delete);
 
 /**
- * drm_gem_map_offset - return the fake mmap offset for a gem object
+ * drm_gem_dumb_map_offset - return the fake mmap offset for a gem object
  * @file: drm file-private structure containing the gem object
  * @dev: corresponding drm_device
  * @handle: gem object handle
@@ -307,14 +307,10 @@ EXPORT_SYMBOL(drm_gem_handle_delete);
  * This implements the &drm_driver.dumb_map_offset kms driver callback for
  * drivers which use gem to manage their backing storage.
  *
- * It can also be used by drivers using GEM BO implementations which
- * have same restriction that imported objects cannot be mapped. The
- * shmem backend is one example.
- *
  * Returns:
  * 0 on success or a negative error code on failure.
  */
-int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev,
+int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
 			    u32 handle, u64 *offset)
 {
 	struct drm_gem_object *obj;
@@ -340,7 +336,7 @@ int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev,
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(drm_gem_map_offset);
+EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset);
 
 /**
  * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers
drivers/gpu/drm/exynos/exynos_drm_gem.c +2 -1
index bf0ad8e5a02b..d734d9d51762 100644
@@ -273,7 +273,8 @@ int exynos_drm_gem_map_ioctl(struct drm_device *dev, void *data,
 {
 	struct drm_exynos_gem_map *args = data;
 
-	return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset);
+	return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
+				       &args->offset);
 }
 
 struct exynos_drm_gem *exynos_drm_gem_get(struct drm_file *filp,
include/drm/drm_gem.h +2 -2
index 0d6445fa9541..ae693c0666cd 100644
@@ -401,8 +401,8 @@ int drm_gem_fence_array_add(struct xarray *fence_array,
 int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
 				     struct drm_gem_object *obj,
 				     bool write);
-int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev,
-		       u32 handle, u64 *offset);
+int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
+			    u32 handle, u64 *offset);
 int drm_gem_dumb_destroy(struct drm_file *file,
 			 struct drm_device *dev,
 			 uint32_t handle);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Re: [PATCH 1/2] Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()"

Quoted 9 lines · Sean Paul

From: Rob Herring <[email protected]>

This reverts commit 220df83a5394fbf7c1486ba7848794b7b351d598.

Turns out drm_gem_dumb_map_offset really only worked for the dumb buffer case, so revert the name change.

This part of the series seems unecessary to revert?

iow I still like this, and Im trying to sell Gerd Hoffmann on it for some of his ttm refactoring ... revert of the revert of the revert of the revert? Probably better if Gerd cherry-picks into his series (if my suggestion works out) and maybe references this entire chain for entertainment purposes :-)
-Daniel

Quoted 99 lines
---
 drivers/gpu/drm/drm_dumb_buffers.c      |  4 ++--
 drivers/gpu/drm/drm_gem.c               | 10 +++-------
 drivers/gpu/drm/exynos/exynos_drm_gem.c |  3 ++-
 include/drm/drm_gem.h                   |  4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_dumb_buffers.c +2 -2
index b55cfc9e8772..d18a740fe0f1 100644
@@ -48,7 +48,7 @@
  * To support dumb objects drivers must implement the &drm_driver.dumb_create
  * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if
  * not set and &drm_driver.dumb_map_offset defaults to
- * drm_gem_map_offset(). See the callbacks for further details.
+ * drm_gem_dumb_map_offset(). See the callbacks for further details.
  *
  * Note that dumb objects may not be used for gpu acceleration, as has been
  * attempted on some ARM embedded platforms. Such drivers really must have
@@ -127,7 +127,7 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev,
 						    args->handle,
 						    &args->offset);
 	else
-		return drm_gem_map_offset(file_priv, dev, args->handle,
+		return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
 					       &args->offset);
 }
 
drivers/gpu/drm/drm_gem.c +3 -7
index 8cbfd60e09c0..afc38cece3f5 100644
@@ -298,7 +298,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
 EXPORT_SYMBOL(drm_gem_handle_delete);
 
 /**
- * drm_gem_map_offset - return the fake mmap offset for a gem object
+ * drm_gem_dumb_map_offset - return the fake mmap offset for a gem object
  * @file: drm file-private structure containing the gem object
  * @dev: corresponding drm_device
  * @handle: gem object handle
@@ -307,14 +307,10 @@ EXPORT_SYMBOL(drm_gem_handle_delete);
  * This implements the &drm_driver.dumb_map_offset kms driver callback for
  * drivers which use gem to manage their backing storage.
  *
- * It can also be used by drivers using GEM BO implementations which
- * have same restriction that imported objects cannot be mapped. The
- * shmem backend is one example.
- *
  * Returns:
  * 0 on success or a negative error code on failure.
  */
-int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev,
+int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
 			    u32 handle, u64 *offset)
 {
 	struct drm_gem_object *obj;
@@ -340,7 +336,7 @@ int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev,
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(drm_gem_map_offset);
+EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset);
 
 /**
  * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers
drivers/gpu/drm/exynos/exynos_drm_gem.c +2 -1
index bf0ad8e5a02b..d734d9d51762 100644
@@ -273,7 +273,8 @@ int exynos_drm_gem_map_ioctl(struct drm_device *dev, void *data,
 {
 	struct drm_exynos_gem_map *args = data;
 
-	return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset);
+	return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
+				       &args->offset);
 }
 
 struct exynos_drm_gem *exynos_drm_gem_get(struct drm_file *filp,
include/drm/drm_gem.h +2 -2
index 0d6445fa9541..ae693c0666cd 100644
@@ -401,8 +401,8 @@ int drm_gem_fence_array_add(struct xarray *fence_array,
 int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
 				     struct drm_gem_object *obj,
 				     bool write);
-int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev,
-		       u32 handle, u64 *offset);
+int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
+			    u32 handle, u64 *offset);
 int drm_gem_dumb_destroy(struct drm_file *file,
 			 struct drm_device *dev,
 			 uint32_t handle);
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer
#3 lore raw

Re: [PATCH 1/2] Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()"

Quoted 6 lines · Daniel Vetter
Quoted 4 lines · Sean Paul

From: Rob Herring <[email protected]>

This reverts commit 220df83a5394fbf7c1486ba7848794b7b351d598.

Quoted 7 lines
Quoted 5 lines

Turns out drm_gem_dumb_map_offset really only worked for the dumb buffer case, so revert the name change.

This part of the series seems unecessary to revert?

Already committed, so let me go revert that right now for you. I can only hope that's enough to get my commit rights revoked too. :)

Quoted 6 lines

iow I still like this, and Im trying to sell Gerd Hoffmann on it for some of his ttm refactoring ... revert of the revert of the revert of the revert? Probably better if Gerd cherry-picks into his series (if my suggestion works out) and maybe references this entire chain for entertainment purposes :-)
-Daniel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#4 lore raw

PATCH 2/2 Revert "drm/panfrost: Use drm_gem_map_offset()"

In reply to Sean Paul

From: Rob Herring <[email protected]>

This reverts commit 583bbf46133c726bae277e8f4e32bfba2a528c7f.

Turns out we need mmap to work on imported BOs even if the current code is buggy.

---
 drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +14 -2
index b2e325e270b7..b187daa4da85 100644
@@ -291,14 +291,26 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv)
 {
 	struct drm_panfrost_mmap_bo *args = data;
+	struct drm_gem_object *gem_obj;
+	int ret;
 
 	if (args->flags != 0) {
 		DRM_INFO("unknown mmap_bo flags: %d\n", args->flags);
 		return -EINVAL;
 	}
 
-	return drm_gem_map_offset(file_priv, dev, args->handle,
-				       &args->offset);
+	gem_obj = drm_gem_object_lookup(file_priv, args->handle);
+	if (!gem_obj) {
+		DRM_DEBUG("Failed to look up GEM BO %d\n", args->handle);
+		return -ENOENT;
+	}
+
+	ret = drm_gem_create_mmap_offset(gem_obj);
+	if (ret == 0)
+		args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
+	drm_gem_object_put_unlocked(gem_obj);
+
+	return ret;
 }
 
 static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 2/2
#5 lore raw

Re: [PATCH 2/2] Revert "drm/panfrost: Use drm_gem_map_offset()"

Quoted 8 lines · Sean Paul

From: Rob Herring <[email protected]>

This reverts commit 583bbf46133c726bae277e8f4e32bfba2a528c7f.

Turns out we need mmap to work on imported BOs even if the current code is buggy.

Personally I would have mentioned a use case where imported BOs are used.

Quoted 2 lines

Regardless of the above nitpick, with the patch order fixed the series is:

... in case you haven't picked it already.

-Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#6 lore raw

Re: [PATCH 2/2] Revert "drm/panfrost: Use drm_gem_map_offset()"

Quoted 11 lines · Emil Velikov
Quoted 8 lines · Sean Paul

From: Rob Herring <[email protected]>

This reverts commit 583bbf46133c726bae277e8f4e32bfba2a528c7f.

Turns out we need mmap to work on imported BOs even if the current code is buggy.

Personally I would have mentioned a use case where imported BOs are used.

Quoted 7 lines
Quoted 2 lines

Regardless of the above nitpick, with the patch order fixed the series is:

... in case you haven't picked it already.

Yeah a follow-up patch to add a comment here about why exactly this went all kaboom, plus which userspace (since panfrost is moving fast) would be real nice here.

Atm we need to hope someone does a git blame on this before the break this again, which seems a bit hopeful ...
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#7 lore raw
In reply to Sean Paul
Quoted 10 lines · Sean Paul

From: Sean Paul <[email protected]>

When I started re-applying these I realized they hadn't hit the list.

Sean

Rob Herring (2):
Revert "drm/gem: Rename drm_gem_dumb_map_offset() to

    drm_gem_map_offset()"

Revert "drm/panfrost: Use drm_gem_map_offset()"

Note I have the order messed up, so will swap it when I apply (and properly compile test in between :/)

Sean

Quoted 11 lines
 drivers/gpu/drm/drm_dumb_buffers.c      |  4 ++--
 drivers/gpu/drm/drm_gem.c               | 10 +++-------
 drivers/gpu/drm/exynos/exynos_drm_gem.c |  3 ++-
 drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++++++++++++++--
 include/drm/drm_gem.h                   |  4 ++--
 5 files changed, 23 insertions(+), 14 deletions(-)
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author Applied
#8 lore raw
In reply to Sean Paul
Quoted 4 lines · Sean Paul

From: Sean Paul <[email protected]>

When I started re-applying these I realized they hadn't hit the list.

Applied to drm-misc-next

Sean

Quoted 17 lines

Sean

Rob Herring (2):
Revert "drm/gem: Rename drm_gem_dumb_map_offset() to

    drm_gem_map_offset()"

Revert "drm/panfrost: Use drm_gem_map_offset()"

 drivers/gpu/drm/drm_dumb_buffers.c      |  4 ++--
 drivers/gpu/drm/drm_gem.c               | 10 +++-------
 drivers/gpu/drm/exynos/exynos_drm_gem.c |  3 ++-
 drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++++++++++++++--
 include/drm/drm_gem.h                   |  4 ++--
 5 files changed, 23 insertions(+), 14 deletions(-)
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel