]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
drm/amd/amdgpu: Update debugfs link_settings output link_rate field in hex
authorAnson Jacob <Anson.Jacob@amd.com>
Tue, 20 Jul 2021 15:00:44 +0000 (11:00 -0400)
committerKelsey Skunberg <kelsey.skunberg@canonical.com>
Tue, 12 Oct 2021 22:31:30 +0000 (16:31 -0600)
BugLink: https://bugs.launchpad.net/bugs/1946802
[ Upstream commit 1a394b3c3de2577f200cb623c52a5c2b82805cec ]

link_rate is updated via debugfs using hex values, set it to output
in hex as well.

eg: Resolution: 1920x1080@144Hz
cat /sys/kernel/debug/dri/0/DP-1/link_settings
Current:  4  0x14  0  Verified:  4  0x1e  0  Reported:  4  0x1e  16  Preferred:  0  0x0  0

echo "4 0x1e" > /sys/kernel/debug/dri/0/DP-1/link_settings

cat /sys/kernel/debug/dri/0/DP-1/link_settings
Current:  4  0x1e  0  Verified:  4  0x1e  0  Reported:  4  0x1e  16  Preferred:  4  0x1e  0

Signed-off-by: Anson Jacob <Anson.Jacob@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c

index f3dfb2887ae0b0adf33e12418ead5e4c5c3895c4..2cdcefab2d7d4f5f693936c9868e418d1e73ecfb 100644 (file)
@@ -95,29 +95,29 @@ static ssize_t dp_link_settings_read(struct file *f, char __user *buf,
 
        rd_buf_ptr = rd_buf;
 
-       str_len = strlen("Current:  %d  %d  %d  ");
-       snprintf(rd_buf_ptr, str_len, "Current:  %d  %d  %d  ",
+       str_len = strlen("Current:  %d  0x%x  %d  ");
+       snprintf(rd_buf_ptr, str_len, "Current:  %d  0x%x  %d  ",
                        link->cur_link_settings.lane_count,
                        link->cur_link_settings.link_rate,
                        link->cur_link_settings.link_spread);
        rd_buf_ptr += str_len;
 
-       str_len = strlen("Verified:  %d  %d  %d  ");
-       snprintf(rd_buf_ptr, str_len, "Verified:  %d  %d  %d  ",
+       str_len = strlen("Verified:  %d  0x%x  %d  ");
+       snprintf(rd_buf_ptr, str_len, "Verified:  %d  0x%x  %d  ",
                        link->verified_link_cap.lane_count,
                        link->verified_link_cap.link_rate,
                        link->verified_link_cap.link_spread);
        rd_buf_ptr += str_len;
 
-       str_len = strlen("Reported:  %d  %d  %d  ");
-       snprintf(rd_buf_ptr, str_len, "Reported:  %d  %d  %d  ",
+       str_len = strlen("Reported:  %d  0x%x  %d  ");
+       snprintf(rd_buf_ptr, str_len, "Reported:  %d  0x%x  %d  ",
                        link->reported_link_cap.lane_count,
                        link->reported_link_cap.link_rate,
                        link->reported_link_cap.link_spread);
        rd_buf_ptr += str_len;
 
-       str_len = strlen("Preferred:  %d  %d  %d  ");
-       snprintf(rd_buf_ptr, str_len, "Preferred:  %d  %d  %d\n",
+       str_len = strlen("Preferred:  %d  0x%x  %d  ");
+       snprintf(rd_buf_ptr, str_len, "Preferred:  %d  0x%x  %d\n",
                        link->preferred_link_setting.lane_count,
                        link->preferred_link_setting.link_rate,
                        link->preferred_link_setting.link_spread);