[PATCH] drm/amd/powerplay: revise the outputs layout of amdgpu_pm_info debugfs

[Quan, Evan]

[AMD Official Use Only - Internal Distribution Only]

Ping..

-----Original Message-----
From: Quan, Evan <Evan.Quan at amd.com>
Sent: Tuesday, July 14, 2020 3:27 PM
To: amd-gfx at lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Quan, Evan <Evan.Quan at amd.com>
Subject: [PATCH] drm/amd/powerplay: revise the outputs layout of amdgpu_pm_info debugfs

The current outputs of amdgpu_pm_info debugfs come with clock gating
status and followed by current clock/power information. However the
clock gating status retrieving may pull GFX out of CG status. That
will make the succeeding clock/power information retrieving inaccurate.

To overcome this and be with minimum impact, the outputs are updated
to show current clock/power information first.

Change-Id: Iff762d47ef0cc9ed309e805b1709ec8cb293d21f
Signed-off-by: Evan Quan <evan.quan at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 20f39aa04fb9..2d379c00c138 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -3879,11 +3879,6 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data)
 return r;
 }

-amdgpu_device_ip_get_clockgating_state(adev, &flags);
-seq_printf(m, "Clock Gating Flags Mask: 0x%x\n", flags);
-amdgpu_parse_cg_state(m, flags);
-seq_printf(m, "\n");
-
 if (!adev->pm.dpm_enabled) {
 seq_printf(m, "dpm not enabled\n");
 pm_runtime_mark_last_busy(dev->dev);
@@ -3903,7 +3898,15 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data)
 } else {
 r = amdgpu_debugfs_pm_info_pp(m, adev);
 }
+if (r)
+goto out;
+
+amdgpu_device_ip_get_clockgating_state(adev, &flags);
+seq_printf(m, "Clock Gating Flags Mask: 0x%x\n", flags);
+amdgpu_parse_cg_state(m, flags);
+seq_printf(m, "\n");

+out:
 pm_runtime_mark_last_busy(dev->dev);
 pm_runtime_put_autosuspend(dev->dev);

--
2.27.0