Commit 81b41ff5 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

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.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1df67a4e

drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

+11 −8
Original line number Diff line number Diff line
@@ -4131,14 +4131,6 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data) 
		return r;

	}



	down_read(&adev->reset_sem);

	amdgpu_device_ip_get_clockgating_state(adev, &flags);

	up_read(&adev->reset_sem);



	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);
@@ -4160,7 +4152,18 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data) 
		r = amdgpu_debugfs_pm_info_pp(m, adev);

	}

	up_read(&adev->reset_sem);

	if (r)

		goto out;



	down_read(&adev->reset_sem);

	amdgpu_device_ip_get_clockgating_state(adev, &flags);

	up_read(&adev->reset_sem);



	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);