drm/amd/amdgpu: move inc gpu_reset_counter after drm_sched_stop

[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 d0a1fee..fb7171e 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 <drm/drm_debugfs.h>
 #include <drm/drm_gem_ttm_helper.h>
 
 #include "amdgpu.h"
@@ -269,8 +268,8 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
                resv = vm->root.base.bo->tbo.base.resv;
        }
 
-retry:
        initial_domain = (u32)(0xffffffff & args->in.domains);
+retry:
        r = amdgpu_gem_object_create(adev, size, args->in.alignment,
                                     initial_domain,
                                     flags, ttm_bo_type_device, resv, &gobj);
@@ -619,7 +618,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
        int r = 0;
 
        if (args->va_address < AMDGPU_VA_RESERVED_SIZE) {
-               dev_dbg(&dev->pdev->dev,
+               dev_dbg(dev->dev,
                        "va_address 0x%LX is in reserved area 0x%LX\n",
                        args->va_address, AMDGPU_VA_RESERVED_SIZE);
                return -EINVAL;
@@ -627,7 +626,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
 
        if (args->va_address >= AMDGPU_GMC_HOLE_START &&
            args->va_address < AMDGPU_GMC_HOLE_END) {
-               dev_dbg(&dev->pdev->dev,
+               dev_dbg(dev->dev,
                        "va_address 0x%LX is in VA hole 0x%LX-0x%LX\n",
                        args->va_address, AMDGPU_GMC_HOLE_START,
                        AMDGPU_GMC_HOLE_END);
@@ -639,14 +638,14 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
        vm_size = adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;
        vm_size -= AMDGPU_VA_RESERVED_SIZE;
        if (args->va_address + args->map_size > vm_size) {
-               dev_dbg(&dev->pdev->dev,
+               dev_dbg(dev->dev,
                        "va_address 0x%llx is in top reserved area 0x%llx\n",
                        args->va_address + args->map_size, vm_size);
                return -EINVAL;
        }
 
        if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) {
-               dev_dbg(&dev->pdev->dev, "invalid flags combination 0x%08X\n",
+               dev_dbg(dev->dev, "invalid flags combination 0x%08X\n",
                        args->flags);
                return -EINVAL;
        }
@@ -658,7 +657,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
        case AMDGPU_VA_OP_REPLACE:
                break;
        default:
-               dev_dbg(&dev->pdev->dev, "unsupported operation %d\n",
+               dev_dbg(dev->dev, "unsupported operation %d\n",
                        args->operation);
                return -EINVAL;
        }
@@ -855,10 +854,10 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
 }
 
 #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;
 
@@ -896,16 +895,17 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data)
        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
 
-int amdgpu_debugfs_gem_init(struct amdgpu_device *adev)
+void amdgpu_debugfs_gem_init(struct amdgpu_device *adev)
 {
 #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
-       return 0;
 }