Hi all,
After merging the amdgpu tree, today's linux-next build (x86
allmodconfig) failed like this:
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_set':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3248:20: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3248 | adev->dm.dc->debug.set_mst_en_for_sst = val;
| ^
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_get':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3257:27: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3257 | *val = adev->dm.dc->debug.set_mst_en_for_sst;
| ^
Caused by commit
99e574ca64d3b6 ("drm/amd/display: Add Debugfs Entry to Force in SST Sequence")
interacting with some of the other DRM trees. Sadly this wasn't a new
version of the tree so it didn't flag up for several merges I've just
patched this out for now:
commit 0456e621ece3c28802799f3ed1f71a63af81960c
Author: Mark Brown <broonie@xxxxxxxxxx>
Date: Mon Dec 13 15:26:46 2021 +0000
amdgpu: Patch out set_mst_en_for_sst
This breaks the build in -next due to issues with another tree:
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_set':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3248:20: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3248 | adev->dm.dc->debug.set_mst_en_for_sst = val;
| ^
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_get':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3257:27: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3257 | *val = adev->dm.dc->debug.set_mst_en_for_sst;
|
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
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 68c379ed12383..df3c615ed7943 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
@@ -3237,30 +3237,6 @@ static int disable_hpd_get(void *data, u64 *val)
DEFINE_DEBUGFS_ATTRIBUTE(disable_hpd_ops, disable_hpd_get,
disable_hpd_set, "%llu\n");
-/*
- * Force sst sequence in mst capable receiver.
- * Example usage: echo 1 > /sys/kernel/debug/dri/0/amdgpu_dm_dp_set_mst_en_for_sst
- */
-static int dp_force_sst_set(void *data, u64 val)
-{
- struct amdgpu_device *adev = data;
-
- adev->dm.dc->debug.set_mst_en_for_sst = val;
-
- return 0;
-}
-
-static int dp_force_sst_get(void *data, u64 *val)
-{
- struct amdgpu_device *adev = data;
-
- *val = adev->dm.dc->debug.set_mst_en_for_sst;
-
- return 0;
-}
-DEFINE_DEBUGFS_ATTRIBUTE(dp_set_mst_en_for_sst_ops, dp_force_sst_get,
- dp_force_sst_set, "%llu\n");
-
/*
* Sets the DC visual confirm debug option from the given string.
* Example usage: echo 1 > /sys/kernel/debug/dri/0/amdgpu_visual_confirm
@@ -3346,8 +3346,6 @@ void dtn_debugfs_init(struct amdgpu_device *adev)
adev, &mst_topo_fops);
debugfs_create_file("amdgpu_dm_dtn_log", 0644, root, adev,
&dtn_log_fops);
- debugfs_create_file("amdgpu_dm_dp_set_mst_en_for_sst", 0644, root, adev,
- &dp_set_mst_en_for_sst_ops);
debugfs_create_file_unsafe("amdgpu_dm_visual_confirm", 0644, root, adev,
&visual_confirm_fops);
