aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
diff options
context:
space:
mode:
authorxinhui pan <xinhui.pan@amd.com>2019-03-11 07:34:23 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-03-19 16:36:52 -0400
commit163def43e9a10ff834859e3b0bf04bcc71b90888 (patch)
treed5b7527528fbd0b510a2de5daafbb91fdc77774e /drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
parentb076296b0fb39f142bdc183d4bab91e7204c53bb (diff)
drm/amdgpu: Fix lockdep warning more gracely
lockdep need a static key. Previously we set ignore bit to avoid the warning. Now call sysfs_attr_init to initialize the static key. Signed-off-by: xinhui pan <xinhui.pan@amd.com> Reviewed-and-Tested-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 1acaa8473629..1f47974b1184 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -748,12 +748,10 @@ static int amdgpu_ras_sysfs_create_feature_node(struct amdgpu_device *adev)
748 .attr = { 748 .attr = {
749 .name = "features", 749 .name = "features",
750 .mode = S_IRUGO, 750 .mode = S_IRUGO,
751#ifdef CONFIG_DEBUG_LOCK_ALLOC
752 .ignore_lockdep = 1,
753#endif
754 }, 751 },
755 .show = amdgpu_ras_sysfs_features_read, 752 .show = amdgpu_ras_sysfs_features_read,
756 }; 753 };
754 sysfs_attr_init(attrs[0]);
757 755
758 return sysfs_create_group(&adev->dev->kobj, &group); 756 return sysfs_create_group(&adev->dev->kobj, &group);
759} 757}
@@ -793,12 +791,10 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev,
793 .attr = { 791 .attr = {
794 .name = obj->fs_data.sysfs_name, 792 .name = obj->fs_data.sysfs_name,
795 .mode = S_IRUGO, 793 .mode = S_IRUGO,
796#ifdef CONFIG_DEBUG_LOCK_ALLOC
797 .ignore_lockdep = 1,
798#endif
799 }, 794 },
800 .show = amdgpu_ras_sysfs_read, 795 .show = amdgpu_ras_sysfs_read,
801 }; 796 };
797 sysfs_attr_init(&obj->sysfs_attr.attr);
802 798
803 if (sysfs_add_file_to_group(&adev->dev->kobj, 799 if (sysfs_add_file_to_group(&adev->dev->kobj,
804 &obj->sysfs_attr.attr, 800 &obj->sysfs_attr.attr,