Merge tag 'kvmarm-fixes-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gem.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index e8c76bd..d0a1fee 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -33,12 +33,16 @@
 
 #include <drm/amdgpu_drm.h>
 #include <drm/drm_debugfs.h>
+#include <drm/drm_gem_ttm_helper.h>
 
 #include "amdgpu.h"
 #include "amdgpu_display.h"
+#include "amdgpu_dma_buf.h"
 #include "amdgpu_xgmi.h"
 
-void amdgpu_gem_object_free(struct drm_gem_object *gobj)
+static const struct drm_gem_object_funcs amdgpu_gem_object_funcs;
+
+static void amdgpu_gem_object_free(struct drm_gem_object *gobj)
 {
        struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj);
 
@@ -73,6 +77,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
                return r;
 
        *obj = &bo->tbo.base;
+       (*obj)->funcs = &amdgpu_gem_object_funcs;
 
        return 0;
 }
@@ -105,8 +110,8 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev)
  * Call from drm_gem_handle_create which appear in both new and open ioctl
  * case.
  */
-int amdgpu_gem_object_open(struct drm_gem_object *obj,
-                          struct drm_file *file_priv)
+static int amdgpu_gem_object_open(struct drm_gem_object *obj,
+                                 struct drm_file *file_priv)
 {
        struct amdgpu_bo *abo = gem_to_amdgpu_bo(obj);
        struct amdgpu_device *adev = amdgpu_ttm_adev(abo->tbo.bdev);
@@ -138,8 +143,8 @@ int amdgpu_gem_object_open(struct drm_gem_object *obj,
        return 0;
 }
 
-void amdgpu_gem_object_close(struct drm_gem_object *obj,
-                            struct drm_file *file_priv)
+static void amdgpu_gem_object_close(struct drm_gem_object *obj,
+                                   struct drm_file *file_priv)
 {
        struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
        struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
@@ -197,6 +202,15 @@ out_unlock:
        ttm_eu_backoff_reservation(&ticket, &list);
 }
 
+static const struct drm_gem_object_funcs amdgpu_gem_object_funcs = {
+       .free = amdgpu_gem_object_free,
+       .open = amdgpu_gem_object_open,
+       .close = amdgpu_gem_object_close,
+       .export = amdgpu_gem_prime_export,
+       .vmap = drm_gem_ttm_vmap,
+       .vunmap = drm_gem_ttm_vunmap,
+};
+
 /*
  * GEM ioctls.
  */
@@ -841,67 +855,6 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
 }
 
 #if defined(CONFIG_DEBUG_FS)
-
-#define amdgpu_debugfs_gem_bo_print_flag(m, bo, flag)  \
-       if (bo->flags & (AMDGPU_GEM_CREATE_ ## flag)) { \
-               seq_printf((m), " " #flag);             \
-       }
-
-static int amdgpu_debugfs_gem_bo_info(int id, void *ptr, void *data)
-{
-       struct drm_gem_object *gobj = ptr;
-       struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj);
-       struct seq_file *m = data;
-
-       struct dma_buf_attachment *attachment;
-       struct dma_buf *dma_buf;
-       unsigned domain;
-       const char *placement;
-       unsigned pin_count;
-
-       domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
-       switch (domain) {
-       case AMDGPU_GEM_DOMAIN_VRAM:
-               placement = "VRAM";
-               break;
-       case AMDGPU_GEM_DOMAIN_GTT:
-               placement = " GTT";
-               break;
-       case AMDGPU_GEM_DOMAIN_CPU:
-       default:
-               placement = " CPU";
-               break;
-       }
-       seq_printf(m, "\t0x%08x: %12ld byte %s",
-                  id, amdgpu_bo_size(bo), placement);
-
-       pin_count = READ_ONCE(bo->pin_count);
-       if (pin_count)
-               seq_printf(m, " pin count %d", pin_count);
-
-       dma_buf = READ_ONCE(bo->tbo.base.dma_buf);
-       attachment = READ_ONCE(bo->tbo.base.import_attach);
-
-       if (attachment)
-               seq_printf(m, " imported from %p%s", dma_buf,
-                          attachment->peer2peer ? " P2P" : "");
-       else if (dma_buf)
-               seq_printf(m, " exported as %p", dma_buf);
-
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, CPU_ACCESS_REQUIRED);
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, NO_CPU_ACCESS);
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, CPU_GTT_USWC);
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, VRAM_CLEARED);
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, SHADOW);
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, VRAM_CONTIGUOUS);
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, VM_ALWAYS_VALID);
-       amdgpu_debugfs_gem_bo_print_flag(m, bo, EXPLICIT_SYNC);
-
-       seq_printf(m, "\n");
-
-       return 0;
-}
-
 static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data)
 {
        struct drm_info_node *node = (struct drm_info_node *)m->private;
@@ -915,6 +868,8 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data)
 
        list_for_each_entry(file, &dev->filelist, lhead) {
                struct task_struct *task;
+               struct drm_gem_object *gobj;
+               int id;
 
                /*
                 * Although we have a valid reference on file->pid, that does
@@ -929,7 +884,11 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data)
                rcu_read_unlock();
 
                spin_lock(&file->table_lock);
-               idr_for_each(&file->object_idr, amdgpu_debugfs_gem_bo_info, m);
+               idr_for_each_entry(&file->object_idr, gobj, id) {
+                       struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj);
+
+                       amdgpu_bo_print_info(id, bo, m);
+               }
                spin_unlock(&file->table_lock);
        }