Merge tag 'for-5.13/libata-2021-04-27' of git://git.kernel.dk/linux-block

[linux.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 b443907afceadfebab03bec153292bff145d5a0a..311bcdc59eda67f3bf11b112bb371ef3fc08db7a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -32,7 +32,6 @@
 #include <linux/dma-buf.h>
 
 #include <drm/amdgpu_drm.h>
 #include <linux/dma-buf.h>
 
 #include <drm/amdgpu_drm.h>

-#include <drm/drm_debugfs.h>

 #include <drm/drm_gem_ttm_helper.h>
 
 #include "amdgpu.h"
 #include <drm/drm_gem_ttm_helper.h>
 
 #include "amdgpu.h"


@@ -59,6 +58,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
                             struct drm_gem_object **obj)
 {
        struct amdgpu_bo *bo;
                             struct drm_gem_object **obj)
 {
        struct amdgpu_bo *bo;

+       struct amdgpu_bo_user *ubo;

        struct amdgpu_bo_param bp;
        int r;
 
        struct amdgpu_bo_param bp;
        int r;
 


@@ -72,10 +72,13 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
        bp.preferred_domain = initial_domain;
        bp.flags = flags;
        bp.domain = initial_domain;
        bp.preferred_domain = initial_domain;
        bp.flags = flags;
        bp.domain = initial_domain;

-       r = amdgpu_bo_create(adev, &bp, &bo);
+       bp.bo_ptr_size = sizeof(struct amdgpu_bo);
+
+       r = amdgpu_bo_create_user(adev, &bp, &ubo);

        if (r)
                return r;
 
        if (r)
                return r;
 

+       bo = &ubo->bo;

        *obj = &bo->tbo.base;
        (*obj)->funcs = &amdgpu_gem_object_funcs;
 
        *obj = &bo->tbo.base;
        (*obj)->funcs = &amdgpu_gem_object_funcs;
 


@@ -855,10 +858,10 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
 }
 
 #if defined(CONFIG_DEBUG_FS)
 }
 
 #if defined(CONFIG_DEBUG_FS)

-static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data)
+static int amdgpu_debugfs_gem_info_show(struct seq_file *m, void *unused)

 {
 {

-       struct drm_info_node *node = (struct drm_info_node *)m->private;
-       struct drm_device *dev = node->minor->dev;
+       struct amdgpu_device *adev = (struct amdgpu_device *)m->private;
+       struct drm_device *dev = adev_to_drm(adev);

        struct drm_file *file;
        int r;
 
        struct drm_file *file;
        int r;
 


@@ -896,16 +899,17 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data)
        return 0;
 }
 
        return 0;
 }
 

-static const struct drm_info_list amdgpu_debugfs_gem_list[] = {
-       {"amdgpu_gem_info", &amdgpu_debugfs_gem_info, 0, NULL},
-};
+DEFINE_SHOW_ATTRIBUTE(amdgpu_debugfs_gem_info);
+

 #endif
 
 #endif
 

-int amdgpu_debugfs_gem_init(struct amdgpu_device *adev)
+void amdgpu_debugfs_gem_init(struct amdgpu_device *adev)

 {
 #if defined(CONFIG_DEBUG_FS)
 {
 #if defined(CONFIG_DEBUG_FS)

-       return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_gem_list,
-                                       ARRAY_SIZE(amdgpu_debugfs_gem_list));
+       struct drm_minor *minor = adev_to_drm(adev)->primary;
+       struct dentry *root = minor->debugfs_root;
+
+       debugfs_create_file("amdgpu_gem_info", 0444, root, adev,
+                           &amdgpu_debugfs_gem_info_fops);

 #endif
 #endif

-       return 0;

 }
 }