Signed-off-by: Nirmoy Das <nirmoy.das@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 131 +++++++++++-------
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 18 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 43 +++---
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 17 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 18 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 47 +++----
.../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 32 ++---
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 17 +--
11 files changed, 171 insertions(+), 169 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index e3d4d2dcb3a0..8d0311ded641 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -795,8 +795,7 @@ struct amdgpu_device {
bool accel_working;
struct notifier_block acpi_nb;
struct amdgpu_i2c_chan *i2c_bus[AMDGPU_MAX_I2C_BUS];
- struct amdgpu_debugfs debugfs[AMDGPU_DEBUGFS_MAX_COMPONENTS];
- unsigned debugfs_count;
+ struct amdgpu_debugfs debugfs;
struct amdgpu_atif *atif;
struct amdgpu_atcs atcs;
struct mutex srbm_mutex;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 55db646d0ba4..8811c6f5be4d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -38,6 +38,21 @@
#include "amdgpu_securedisplay.h"
#include "amdgpu_fw_attestation.h"
+static int amdgpu_debugfs_open(struct inode *inode, struct file
*file)
+{
+ struct amdgpu_debugfs_info_node *tmp = inode->i_private;
+
+ return single_open(file, tmp->show, tmp);
+}
+
+static const struct file_operations amdgpu_debugfs_fops = {
+ .owner = THIS_MODULE,
+ .open = amdgpu_debugfs_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
/**
* amdgpu_debugfs_add_files - Add simple debugfs entries
*
@@ -46,35 +61,29 @@
* @nfiles: Number of callbacks to register
*
*/
-int amdgpu_debugfs_add_files(struct amdgpu_device *adev,
- const struct drm_info_list *files,
- unsigned nfiles)
+void amdgpu_debugfs_add_files(struct amdgpu_device *adev,
+ const char *name,
+ int (*show)(struct seq_file *m, void *data),
+ void *data)
{
- unsigned i;
+#if defined(CONFIG_DEBUG_FS)
+ umode_t mode = S_IFREG | S_IRUGO;
+ struct dentry *root = adev_to_drm(adev)->primary->debugfs_root;
+ struct amdgpu_debugfs_info_node *tmp;
- for (i = 0; i < adev->debugfs_count; i++) {
- if (adev->debugfs[i].files == files) {
- /* Already registered */
- return 0;
- }
- }
+ tmp = kmalloc(sizeof(struct amdgpu_debugfs_info_node), GFP_KERNEL);
+ if (tmp == NULL)
+ return;
- i = adev->debugfs_count + 1;
- if (i > AMDGPU_DEBUGFS_MAX_COMPONENTS) {
- DRM_ERROR("Reached maximum number of debugfs components.\n");
- DRM_ERROR("Report so we increase "
- "AMDGPU_DEBUGFS_MAX_COMPONENTS.\n");
- return -EINVAL;
- }
- adev->debugfs[adev->debugfs_count].files = files;
- adev->debugfs[adev->debugfs_count].num_files = nfiles;
- adev->debugfs_count = i;
-#if defined(CONFIG_DEBUG_FS)
- drm_debugfs_create_files(files, nfiles,
- adev_to_drm(adev)->primary->debugfs_root,
- adev_to_drm(adev)->primary);
+ tmp->adev = adev;
+ tmp->data = data;
+ tmp->show = show;
+
+ debugfs_create_file(name, mode, root, tmp,&amdgpu_debugfs_fops);
+ mutex_lock(&adev->debugfs.debugfs_lock);
+ list_add(&tmp->list, &adev->debugfs.debugfs_list);
+ mutex_unlock(&adev->debugfs.debugfs_lock);
#endif
- return 0;
}
int amdgpu_debugfs_wait_dump(struct amdgpu_device *adev)
@@ -1235,14 +1244,14 @@ int amdgpu_debugfs_regs_init(struct
amdgpu_device *adev)
static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
+ struct drm_device *dev = adev_to_drm(adev);
int r = 0, i;
r = pm_runtime_get_sync(dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
+ pm_runtime_put_autosuspend(dev->dev);
return r;
}
@@ -1286,9 +1295,8 @@ static int amdgpu_debugfs_test_ib(struct
seq_file *m, void *data)
static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void
*data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
seq_write(m, adev->bios, adev->bios_size);
return 0;
@@ -1296,14 +1304,14 @@ static int
amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)
static int amdgpu_debugfs_evict_vram(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
+ struct drm_device *dev = adev_to_drm(adev);
int r;
r = pm_runtime_get_sync(dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
+ pm_runtime_put_autosuspend(dev->dev);
return r;
}
@@ -1317,14 +1325,14 @@ static int amdgpu_debugfs_evict_vram(struct
seq_file *m, void *data)
static int amdgpu_debugfs_evict_gtt(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
+ struct drm_device *dev = adev_to_drm(adev);
int r;
r = pm_runtime_get_sync(dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
+ pm_runtime_put_autosuspend(dev->dev);
return r;
}
@@ -1338,8 +1346,9 @@ static int amdgpu_debugfs_evict_gtt(struct
seq_file *m, void *data)
static int amdgpu_debugfs_vm_info(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
+ struct drm_device *dev = adev_to_drm(adev);
struct drm_file *file;
int r;
@@ -1365,14 +1374,6 @@ static int amdgpu_debugfs_vm_info(struct
seq_file *m, void *data)
return r;
}
-static const struct drm_info_list amdgpu_debugfs_list[] = {
- {"amdgpu_vbios", amdgpu_debugfs_get_vbios_dump},
- {"amdgpu_test_ib", &amdgpu_debugfs_test_ib},
- {"amdgpu_evict_vram", &amdgpu_debugfs_evict_vram},
- {"amdgpu_evict_gtt", &amdgpu_debugfs_evict_gtt},
- {"amdgpu_vm_info", &amdgpu_debugfs_vm_info},
-};
-
static void amdgpu_ib_preempt_fences_swap(struct amdgpu_ring *ring,
struct dma_fence **fences)
{
@@ -1593,6 +1594,9 @@ int amdgpu_debugfs_init(struct amdgpu_device
*adev)
struct dentry *ent;
int r, i;
+ INIT_LIST_HEAD(&adev->debugfs.debugfs_list);
+ mutex_init(&adev->debugfs.debugfs_lock);
+
ent = debugfs_create_file("amdgpu_preempt_ib", 0600,
adev_to_drm(adev)->primary->debugfs_root, adev,
&fops_ib_preempt);
@@ -1669,10 +1673,29 @@ int amdgpu_debugfs_init(struct amdgpu_device
*adev)
amdgpu_fw_attestation_debugfs_init(adev);
- return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,
- ARRAY_SIZE(amdgpu_debugfs_list));
+ amdgpu_debugfs_add_files(adev, "amdgpu_vbios",
amdgpu_debugfs_get_vbios_dump, NULL);
+ amdgpu_debugfs_add_files(adev, "amdgpu_test_ib",
amdgpu_debugfs_test_ib, NULL);
+ amdgpu_debugfs_add_files(adev, "amdgpu_evict_vram",
amdgpu_debugfs_evict_vram, NULL);
+ amdgpu_debugfs_add_files(adev, "amdgpu_evict_gtt",
amdgpu_debugfs_evict_gtt, NULL);
+ amdgpu_debugfs_add_files(adev, "amdgpu_vm_info",
amdgpu_debugfs_vm_info, NULL);
+
+ return 0;
}
+void amdgpu_debugfs_fini(struct amdgpu_device *adev)
+{
+ struct list_head *pos, *q;
+ struct amdgpu_debugfs_info_node *tmp;
+
+ mutex_lock(&adev->debugfs.debugfs_lock);
+ list_for_each_safe(pos, q, &adev->debugfs.debugfs_list) {
+ tmp = list_entry(pos, struct amdgpu_debugfs_info_node, list);
+ list_del(pos);
+ kfree(tmp);
+ }
+ mutex_unlock(&adev->debugfs.debugfs_lock);
+
+}
#else
int amdgpu_debugfs_init(struct amdgpu_device *adev)
{
@@ -1682,4 +1705,8 @@ int amdgpu_debugfs_regs_init(struct
amdgpu_device *adev)
{
return 0;
}
+
+void amdgpu_debugfs_fini(struct amdgpu_device *adev)
+{
+}
#endif
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
index 2803884d338d..44121fe09ec3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
@@ -27,10 +27,18 @@
* Debugfs
*/
struct amdgpu_debugfs {
- const struct drm_info_list *files;
- unsigned num_files;
+ struct list_head debugfs_list;
+ struct mutex debugfs_lock; /* Protects debugfs_list. */
};
+struct amdgpu_debugfs_info_node {
+ int (*show)(struct seq_file*, void*);
+ void *data;
+ struct amdgpu_device *adev;
+
+ struct list_head list;
+
+};
struct amdgpu_autodump {
struct completion dumping;
struct wait_queue_head gpu_hang;
@@ -39,9 +47,9 @@ struct amdgpu_autodump {
int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);
int amdgpu_debugfs_init(struct amdgpu_device *adev);
void amdgpu_debugfs_fini(struct amdgpu_device *adev);
-int amdgpu_debugfs_add_files(struct amdgpu_device *adev,
- const struct drm_info_list *files,
- unsigned nfiles);
+void amdgpu_debugfs_add_files(struct amdgpu_device *adev, const char
*name,
+ int (*show)(struct seq_file *m, void *data),
+ void *data);
int amdgpu_debugfs_fence_init(struct amdgpu_device *adev);
int amdgpu_debugfs_firmware_init(struct amdgpu_device *adev);
int amdgpu_debugfs_gem_init(struct amdgpu_device *adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index b7ee587484b2..5eac4ce1c508 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1250,6 +1250,7 @@ static void
amdgpu_pci_remove(struct pci_dev *pdev)
{
struct drm_device *dev = pci_get_drvdata(pdev);
+ struct amdgpu_device *adev = drm_to_adev(dev);
#ifdef MODULE
if (THIS_MODULE->state != MODULE_STATE_GOING)
@@ -1259,6 +1260,7 @@ amdgpu_pci_remove(struct pci_dev *pdev)
amdgpu_driver_unload_kms(dev);
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
+ amdgpu_debugfs_fini(adev);
drm_dev_put(dev);
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index d56f4023ebb3..00bb64fc88af 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -699,9 +699,9 @@ static const struct dma_fence_ops
amdgpu_fence_ops = {
#if defined(CONFIG_DEBUG_FS)
static int amdgpu_debugfs_fence_info(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
int i;
for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
@@ -748,46 +748,37 @@ static int amdgpu_debugfs_fence_info(struct
seq_file *m, void *data)
*/
static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
int r;
- r = pm_runtime_get_sync(dev->dev);
+ r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(dev->dev);
+ pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
return 0;
}
seq_printf(m, "gpu recover\n");
amdgpu_device_gpu_recover(adev, NULL);
- pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
+ pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
return 0;
}
-
-static const struct drm_info_list amdgpu_debugfs_fence_list[] = {
- {"amdgpu_fence_info", &amdgpu_debugfs_fence_info, 0, NULL},
- {"amdgpu_gpu_recover", &amdgpu_debugfs_gpu_recover, 0, NULL}
-};
-
-static const struct drm_info_list amdgpu_debugfs_fence_list_sriov[] = {
- {"amdgpu_fence_info", &amdgpu_debugfs_fence_info, 0, NULL},
-};
#endif
int amdgpu_debugfs_fence_init(struct amdgpu_device *adev)
{
#if defined(CONFIG_DEBUG_FS)
- if (amdgpu_sriov_vf(adev))
- return amdgpu_debugfs_add_files(adev,
amdgpu_debugfs_fence_list_sriov,
- ARRAY_SIZE(amdgpu_debugfs_fence_list_sriov));
- return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_fence_list,
- ARRAY_SIZE(amdgpu_debugfs_fence_list));
-#else
- return 0;
+ amdgpu_debugfs_add_files(adev, "amdgpu_fence_info",
+ amdgpu_debugfs_fence_info, NULL);
+
+ if (!amdgpu_sriov_vf(adev))
+ amdgpu_debugfs_add_files(adev, "amdgpu_gpu_recover",
+ amdgpu_debugfs_gpu_recover, NULL);
#endif
+ return 0;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 5b50860eece4..dda268336bb0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -838,8 +838,9 @@ 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)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
+ struct drm_device *dev = adev_to_drm(adev);
struct drm_file *file;
int r;
@@ -877,16 +878,13 @@ 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},
-};
#endif
int 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));
+ amdgpu_debugfs_add_files(adev, "amdgpu_gem_info",
+ amdgpu_debugfs_gem_info, NULL);
#endif
return 0;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 7645223ea0ef..836e5ea5143a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -455,9 +455,8 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
static int amdgpu_debugfs_sa_info(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
seq_printf(m, "--------------------- DELAYED
--------------------- \n");
amdgpu_sa_bo_dump_debug_info(&adev->ib_pools[AMDGPU_IB_POOL_DELAYED],
@@ -470,19 +469,13 @@ static int amdgpu_debugfs_sa_info(struct
seq_file *m, void *data)
return 0;
}
-
-static const struct drm_info_list amdgpu_debugfs_sa_list[] = {
- {"amdgpu_sa_info", &amdgpu_debugfs_sa_info, 0, NULL},
-};
-
#endif
int amdgpu_debugfs_sa_init(struct amdgpu_device *adev)
{
#if defined(CONFIG_DEBUG_FS)
- return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_sa_list,
- ARRAY_SIZE(amdgpu_debugfs_sa_list));
-#else
- return 0;
+ amdgpu_debugfs_add_files(adev, "amdgpu_sa_info",
+ amdgpu_debugfs_sa_info, NULL);
#endif
+ return 0;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index e365c4fdcfe3..6c7296754ef6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -1289,9 +1289,9 @@ const int amdgpu_max_kms_ioctl =
ARRAY_SIZE(amdgpu_ioctls_kms);
static int amdgpu_debugfs_firmware_info(struct seq_file *m, void
*data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
struct drm_amdgpu_info_firmware fw_info;
struct drm_amdgpu_query_fw query_fw;
struct atom_context *ctx = adev->mode_info.atom_context;
@@ -1496,18 +1496,14 @@ static int
amdgpu_debugfs_firmware_info(struct seq_file *m, void *data)
return 0;
}
-
-static const struct drm_info_list amdgpu_firmware_info_list[] = {
- {"amdgpu_firmware_info", amdgpu_debugfs_firmware_info, 0, NULL},
-};
#endif
int amdgpu_debugfs_firmware_init(struct amdgpu_device *adev)
{
#if defined(CONFIG_DEBUG_FS)
- return amdgpu_debugfs_add_files(adev, amdgpu_firmware_info_list,
- ARRAY_SIZE(amdgpu_firmware_info_list));
-#else
- return 0;
+ amdgpu_debugfs_add_files(adev, "amdgpu_firmware_info",
+ amdgpu_debugfs_firmware_info,
+ NULL);
#endif
+ return 0;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ce92768cd146..0eb2f7282330 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2255,10 +2255,10 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
static int amdgpu_mm_dump_table(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- unsigned ttm_pl = (uintptr_t)node->info_ent->data;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ unsigned ttm_pl = (uintptr_t)node->data;
+ struct amdgpu_device *adev = node->adev;
struct ttm_resource_manager *man =
ttm_manager_type(&adev->mman.bdev, ttm_pl);
struct drm_printer p = drm_seq_file_printer(m);
@@ -2266,18 +2266,6 @@ static int amdgpu_mm_dump_table(struct
seq_file *m, void *data)
return 0;
}
-static const struct drm_info_list amdgpu_ttm_debugfs_list[] = {
- {"amdgpu_vram_mm", amdgpu_mm_dump_table, 0, (void *)TTM_PL_VRAM},
- {"amdgpu_gtt_mm", amdgpu_mm_dump_table, 0, (void *)TTM_PL_TT},
- {"amdgpu_gds_mm", amdgpu_mm_dump_table, 0, (void *)AMDGPU_PL_GDS},
- {"amdgpu_gws_mm", amdgpu_mm_dump_table, 0, (void *)AMDGPU_PL_GWS},
- {"amdgpu_oa_mm", amdgpu_mm_dump_table, 0, (void *)AMDGPU_PL_OA},
- {"ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL},
-#ifdef CONFIG_SWIOTLB
- {"ttm_dma_page_pool", ttm_dma_page_alloc_debugfs, 0, NULL}
-#endif
-};
-
/*
* amdgpu_ttm_vram_read - Linear read access to VRAM
*
@@ -2483,8 +2471,6 @@ static const struct file_operations
amdgpu_ttm_iomem_fops = {
int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
{
#if defined(CONFIG_DEBUG_FS)
- unsigned count;
-
struct drm_minor *minor = adev_to_drm(adev)->primary;
umode_t mode = S_IFREG | S_IRUGO;
struct dentry *root = minor->debugfs_root;
@@ -2493,15 +2479,26 @@ int amdgpu_ttm_debugfs_init(struct
amdgpu_device *adev)
&amdgpu_ttm_vram_fops, adev->gmc.mc_vram_size);
debugfs_create_file("amdgpu_iomem", mode, root, adev,
&amdgpu_ttm_iomem_fops);
- count = ARRAY_SIZE(amdgpu_ttm_debugfs_list);
+ amdgpu_debugfs_add_files(adev, "amdgpu_vram_mm",
amdgpu_mm_dump_table,
+ (void *)TTM_PL_VRAM);
+ amdgpu_debugfs_add_files(adev, "amdgpu_gtt_mm",
amdgpu_mm_dump_table,
+ (void *)TTM_PL_TT);
+ amdgpu_debugfs_add_files(adev, "amdgpu_gds_mm",
amdgpu_mm_dump_table,
+ (void *)AMDGPU_PL_GDS);
+ amdgpu_debugfs_add_files(adev, "amdgpu_gws_mm",
amdgpu_mm_dump_table,
+ (void *)AMDGPU_PL_GWS);
+ amdgpu_debugfs_add_files(adev, "amdgpu_oa_mm",
amdgpu_mm_dump_table,
+ (void *)AMDGPU_PL_OA);
+ amdgpu_debugfs_add_files(adev, "ttm_page_pool",
ttm_page_alloc_debugfs,
+ NULL);
#ifdef CONFIG_SWIOTLB
- if (!(adev->need_swiotlb && swiotlb_nr_tbl()))
- --count;
-#endif
- return amdgpu_debugfs_add_files(adev, amdgpu_ttm_debugfs_list,
count);
-#else
- return 0;
+ if ((adev->need_swiotlb && swiotlb_nr_tbl()))
+ amdgpu_debugfs_add_files(adev, "ttm_dma_page_pool",
+ ttm_dma_page_alloc_debugfs, NULL);
+
#endif
+#endif
+ return 0;
}
diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
index 360952129b6d..1d28b1c01874 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
@@ -2452,9 +2452,8 @@ static ssize_t dtn_log_write(
*/
static int current_backlight_read(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
struct amdgpu_display_manager *dm = &adev->dm;
unsigned int backlight =
dc_link_get_backlight_level(dm->backlight_link);
@@ -2470,9 +2469,8 @@ static int current_backlight_read(struct
seq_file *m, void *data)
*/
static int target_backlight_read(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *)m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
struct amdgpu_display_manager *dm = &adev->dm;
unsigned int backlight =
dc_link_get_target_backlight_pwm(dm->backlight_link);
@@ -2483,8 +2481,10 @@ static int target_backlight_read(struct
seq_file *m, void *data)
static int mst_topo(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_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
+ struct drm_device *dev = adev_to_drm(adev);
struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
struct amdgpu_dm_connector *aconnector;
@@ -2504,12 +2504,6 @@ static int mst_topo(struct seq_file *m, void
*unused)
return 0;
}
-static const struct drm_info_list amdgpu_dm_debugfs_list[] = {
- {"amdgpu_current_backlight_pwm", ¤t_backlight_read},
- {"amdgpu_target_backlight_pwm", &target_backlight_read},
- {"amdgpu_mst_topology", &mst_topo},
-};
-
/*
* Sets the force_timing_sync debug optino from the given string.
* All connected displays will be force synchronized immediately.
@@ -2582,12 +2576,12 @@ int dtn_debugfs_init(struct amdgpu_device *adev)
struct drm_minor *minor = adev_to_drm(adev)->primary;
struct dentry *root = minor->debugfs_root;
- int ret;
- ret = amdgpu_debugfs_add_files(adev, amdgpu_dm_debugfs_list,
- ARRAY_SIZE(amdgpu_dm_debugfs_list));
- if (ret)
- return ret;
+ amdgpu_debugfs_add_files(adev, "amdgpu_current_backlight_pwm",
+ current_backlight_read, NULL);
+ amdgpu_debugfs_add_files(adev, "amdgpu_target_backlight_pwm",
+ target_backlight_read, NULL);
+ amdgpu_debugfs_add_files(adev, "amdgpu_mst_topology", mst_topo,
NULL);
debugfs_create_file("amdgpu_dm_dtn_log", 0644, root, adev,
&dtn_log_fops);
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 5fa65f191a37..1bbe7b8738ea 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -3786,9 +3786,10 @@ static void amdgpu_parse_cg_state(struct
seq_file *m, u32 flags)
static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data)
{
- struct drm_info_node *node = (struct drm_info_node *) m->private;
- struct drm_device *dev = node->minor->dev;
- struct amdgpu_device *adev = drm_to_adev(dev);
+
+ struct amdgpu_debugfs_info_node *node = (struct
amdgpu_debugfs_info_node *) m->private;
+ struct amdgpu_device *adev = node->adev;
+ struct drm_device *dev = adev_to_drm(adev);
u32 flags = 0;
int r;
@@ -3835,17 +3836,13 @@ static int amdgpu_debugfs_pm_info(struct
seq_file *m, void *data)
return r;
}
-
-static const struct drm_info_list amdgpu_pm_info_list[] = {
- {"amdgpu_pm_info", amdgpu_debugfs_pm_info, 0, NULL},
-};
#endif
int amdgpu_debugfs_pm_init(struct amdgpu_device *adev)
{
#if defined(CONFIG_DEBUG_FS)
- return amdgpu_debugfs_add_files(adev, amdgpu_pm_info_list,
ARRAY_SIZE(amdgpu_pm_info_list));
-#else
- return 0;
+ amdgpu_debugfs_add_files(adev, "amdgpu_pm_info",
+ amdgpu_debugfs_pm_info, NULL);
#endif
+ return 0;
}
