diff mbox series

[04/10] drm/gem-shmem: Test for imported buffers with drm_gem_is_imported()

Message ID 20250226172457.217725-5-tzimmermann@suse.de (mailing list archive)
State New
Headers show
Series drm: Hide import_attach from GEM code and helpers | expand

Commit Message

Thomas Zimmermann Feb. 26, 2025, 5:03 p.m. UTC 
Instead of testing import_attach for imported GEM buffers, invoke
drm_gem_is_imported() to do the test.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 24 ++++++++++++------------
 include/drm/drm_gem_shmem_helper.h     |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

Comments

Anusha Srivatsa Feb. 28, 2025, 4:15 p.m. UTC | #1 
On Wed, Feb 26, 2025 at 12:28 PM Thomas Zimmermann <tzimmermann@suse.de>
wrote:

> Instead of testing import_attach for imported GEM buffers, invoke
> drm_gem_is_imported() to do the test.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>  drivers/gpu/drm/drm_gem_shmem_helper.c | 24 ++++++++++++------------
>  include/drm/drm_gem_shmem_helper.h     |  2 +-
>  2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c
> b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 5ab351409312..7722cd720248 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -160,7 +160,7 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object
> *shmem)
>  {
>         struct drm_gem_object *obj = &shmem->base;
>
> -       if (obj->import_attach) {
> +       if (drm_gem_is_imported(obj)) {
>                 drm_prime_gem_destroy(obj, shmem->sgt);
>         } else {
>                 dma_resv_lock(shmem->base.resv, NULL);
> @@ -255,7 +255,7 @@ int drm_gem_shmem_pin_locked(struct
> drm_gem_shmem_object *shmem)
>
>         dma_resv_assert_held(shmem->base.resv);
>
> -       drm_WARN_ON(shmem->base.dev, shmem->base.import_attach);
> +       drm_WARN_ON(shmem->base.dev, drm_gem_is_imported(&shmem->base));
>
>         ret = drm_gem_shmem_get_pages(shmem);
>
> @@ -286,7 +286,7 @@ int drm_gem_shmem_pin(struct drm_gem_shmem_object
> *shmem)
>         struct drm_gem_object *obj = &shmem->base;
>         int ret;
>
> -       drm_WARN_ON(obj->dev, obj->import_attach);
> +       drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
>
>         ret = dma_resv_lock_interruptible(shmem->base.resv, NULL);
>         if (ret)
> @@ -309,7 +309,7 @@ void drm_gem_shmem_unpin(struct drm_gem_shmem_object
> *shmem)
>  {
>         struct drm_gem_object *obj = &shmem->base;
>
> -       drm_WARN_ON(obj->dev, obj->import_attach);
> +       drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
>
>         dma_resv_lock(shmem->base.resv, NULL);
>         drm_gem_shmem_unpin_locked(shmem);
> @@ -338,7 +338,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object
> *shmem,
>         struct drm_gem_object *obj = &shmem->base;
>         int ret = 0;
>
> -       if (obj->import_attach) {
> +       if (drm_gem_is_imported(obj)) {
>                 ret = dma_buf_vmap(obj->import_attach->dmabuf, map);
>                 if (!ret) {
>                         if (drm_WARN_ON(obj->dev, map->is_iomem)) {
> @@ -378,7 +378,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object
> *shmem,
>         return 0;
>
>  err_put_pages:
> -       if (!obj->import_attach)
> +       if (!drm_gem_is_imported(obj))
>                 drm_gem_shmem_put_pages(shmem);
>  err_zero_use:
>         shmem->vmap_use_count = 0;
> @@ -404,7 +404,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object
> *shmem,
>  {
>         struct drm_gem_object *obj = &shmem->base;
>
> -       if (obj->import_attach) {
> +       if (drm_gem_is_imported(obj)) {
>                 dma_buf_vunmap(obj->import_attach->dmabuf, map);
>         } else {
>                 dma_resv_assert_held(shmem->base.resv);
> @@ -566,7 +566,7 @@ static void drm_gem_shmem_vm_open(struct
> vm_area_struct *vma)
>         struct drm_gem_object *obj = vma->vm_private_data;
>         struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
>
> -       drm_WARN_ON(obj->dev, obj->import_attach);
> +       drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
>
>         dma_resv_lock(shmem->base.resv, NULL);
>
> @@ -618,7 +618,7 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object
> *shmem, struct vm_area_struct
>         struct drm_gem_object *obj = &shmem->base;
>         int ret;
>
> -       if (obj->import_attach) {
> +       if (drm_gem_is_imported(obj)) {
>                 /* Reset both vm_ops and vm_private_data, so we don't end
> up with
>                  * vm_ops pointing to our implementation if the dma-buf
> backend
>                  * doesn't set those fields.
> @@ -663,7 +663,7 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_mmap);
>  void drm_gem_shmem_print_info(const struct drm_gem_shmem_object *shmem,
>                               struct drm_printer *p, unsigned int indent)
>  {
> -       if (shmem->base.import_attach)
> +       if (drm_gem_is_imported(&shmem->base))
>                 return;
>
>         drm_printf_indent(p, indent, "pages_use_count=%u\n",
> shmem->pages_use_count);
> @@ -690,7 +690,7 @@ struct sg_table *drm_gem_shmem_get_sg_table(struct
> drm_gem_shmem_object *shmem)
>  {
>         struct drm_gem_object *obj = &shmem->base;
>
> -       drm_WARN_ON(obj->dev, obj->import_attach);
> +       drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
>
>         return drm_prime_pages_to_sg(obj->dev, shmem->pages, obj->size >>
> PAGE_SHIFT);
>  }
> @@ -705,7 +705,7 @@ static struct sg_table
> *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_
>         if (shmem->sgt)
>                 return shmem->sgt;
>
> -       drm_WARN_ON(obj->dev, obj->import_attach);
> +       drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
>
>         ret = drm_gem_shmem_get_pages(shmem);
>         if (ret)
> diff --git a/include/drm/drm_gem_shmem_helper.h
> b/include/drm/drm_gem_shmem_helper.h
> index d22e3fb53631..cef5a6b5a4d6 100644
> --- a/include/drm/drm_gem_shmem_helper.h
> +++ b/include/drm/drm_gem_shmem_helper.h
> @@ -120,7 +120,7 @@ static inline bool drm_gem_shmem_is_purgeable(struct
> drm_gem_shmem_object *shmem
>  {
>         return (shmem->madv > 0) &&
>                 !shmem->vmap_use_count && shmem->sgt &&
> -               !shmem->base.dma_buf && !shmem->base.import_attach;
> +               !shmem->base.dma_buf && !drm_gem_is_imported(&shmem->base);
>  }
>
> Reviewed-by: Anusha Srivatsa <asrivats@redhat.com>

>  void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem);
> --
> 2.48.1
>
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 5ab351409312..7722cd720248 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -160,7 +160,7 @@  void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem)
 {
 	struct drm_gem_object *obj = &shmem->base;
 
-	if (obj->import_attach) {
+	if (drm_gem_is_imported(obj)) {
 		drm_prime_gem_destroy(obj, shmem->sgt);
 	} else {
 		dma_resv_lock(shmem->base.resv, NULL);
@@ -255,7 +255,7 @@  int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem)
 
 	dma_resv_assert_held(shmem->base.resv);
 
-	drm_WARN_ON(shmem->base.dev, shmem->base.import_attach);
+	drm_WARN_ON(shmem->base.dev, drm_gem_is_imported(&shmem->base));
 
 	ret = drm_gem_shmem_get_pages(shmem);
 
@@ -286,7 +286,7 @@  int drm_gem_shmem_pin(struct drm_gem_shmem_object *shmem)
 	struct drm_gem_object *obj = &shmem->base;
 	int ret;
 
-	drm_WARN_ON(obj->dev, obj->import_attach);
+	drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
 
 	ret = dma_resv_lock_interruptible(shmem->base.resv, NULL);
 	if (ret)
@@ -309,7 +309,7 @@  void drm_gem_shmem_unpin(struct drm_gem_shmem_object *shmem)
 {
 	struct drm_gem_object *obj = &shmem->base;
 
-	drm_WARN_ON(obj->dev, obj->import_attach);
+	drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
 
 	dma_resv_lock(shmem->base.resv, NULL);
 	drm_gem_shmem_unpin_locked(shmem);
@@ -338,7 +338,7 @@  int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,
 	struct drm_gem_object *obj = &shmem->base;
 	int ret = 0;
 
-	if (obj->import_attach) {
+	if (drm_gem_is_imported(obj)) {
 		ret = dma_buf_vmap(obj->import_attach->dmabuf, map);
 		if (!ret) {
 			if (drm_WARN_ON(obj->dev, map->is_iomem)) {
@@ -378,7 +378,7 @@  int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,
 	return 0;
 
 err_put_pages:
-	if (!obj->import_attach)
+	if (!drm_gem_is_imported(obj))
 		drm_gem_shmem_put_pages(shmem);
 err_zero_use:
 	shmem->vmap_use_count = 0;
@@ -404,7 +404,7 @@  void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,
 {
 	struct drm_gem_object *obj = &shmem->base;
 
-	if (obj->import_attach) {
+	if (drm_gem_is_imported(obj)) {
 		dma_buf_vunmap(obj->import_attach->dmabuf, map);
 	} else {
 		dma_resv_assert_held(shmem->base.resv);
@@ -566,7 +566,7 @@  static void drm_gem_shmem_vm_open(struct vm_area_struct *vma)
 	struct drm_gem_object *obj = vma->vm_private_data;
 	struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
 
-	drm_WARN_ON(obj->dev, obj->import_attach);
+	drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
 
 	dma_resv_lock(shmem->base.resv, NULL);
 
@@ -618,7 +618,7 @@  int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
 	struct drm_gem_object *obj = &shmem->base;
 	int ret;
 
-	if (obj->import_attach) {
+	if (drm_gem_is_imported(obj)) {
 		/* Reset both vm_ops and vm_private_data, so we don't end up with
 		 * vm_ops pointing to our implementation if the dma-buf backend
 		 * doesn't set those fields.
@@ -663,7 +663,7 @@  EXPORT_SYMBOL_GPL(drm_gem_shmem_mmap);
 void drm_gem_shmem_print_info(const struct drm_gem_shmem_object *shmem,
 			      struct drm_printer *p, unsigned int indent)
 {
-	if (shmem->base.import_attach)
+	if (drm_gem_is_imported(&shmem->base))
 		return;
 
 	drm_printf_indent(p, indent, "pages_use_count=%u\n", shmem->pages_use_count);
@@ -690,7 +690,7 @@  struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem)
 {
 	struct drm_gem_object *obj = &shmem->base;
 
-	drm_WARN_ON(obj->dev, obj->import_attach);
+	drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
 
 	return drm_prime_pages_to_sg(obj->dev, shmem->pages, obj->size >> PAGE_SHIFT);
 }
@@ -705,7 +705,7 @@  static struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_
 	if (shmem->sgt)
 		return shmem->sgt;
 
-	drm_WARN_ON(obj->dev, obj->import_attach);
+	drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
 
 	ret = drm_gem_shmem_get_pages(shmem);
 	if (ret)
diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
index d22e3fb53631..cef5a6b5a4d6 100644
--- a/include/drm/drm_gem_shmem_helper.h
+++ b/include/drm/drm_gem_shmem_helper.h
@@ -120,7 +120,7 @@  static inline bool drm_gem_shmem_is_purgeable(struct drm_gem_shmem_object *shmem
 {
 	return (shmem->madv > 0) &&
 		!shmem->vmap_use_count && shmem->sgt &&
-		!shmem->base.dma_buf && !shmem->base.import_attach;
+		!shmem->base.dma_buf && !drm_gem_is_imported(&shmem->base);
 }
 
 void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem);