openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
xinhui pan 2019-03-11 19:34:23 +08:00 committed by Alex Deucher
parent b076296b0f
commit 163def43e9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
View File

@ -748,12 +748,10 @@ static int amdgpu_ras_sysfs_create_feature_node(struct amdgpu_device *adev)
.attr = { .attr = {
.name = "features", .name = "features",
.mode = S_IRUGO, .mode = S_IRUGO,
#ifdef CONFIG_DEBUG_LOCK_ALLOC
.ignore_lockdep = 1,
#endif
}, },
.show = amdgpu_ras_sysfs_features_read, .show = amdgpu_ras_sysfs_features_read,
}; };
sysfs_attr_init(attrs[0]);
return sysfs_create_group(&adev->dev->kobj, &group); return sysfs_create_group(&adev->dev->kobj, &group);
} }
@ -793,12 +791,10 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev,
.attr = { .attr = {
.name = obj->fs_data.sysfs_name, .name = obj->fs_data.sysfs_name,
.mode = S_IRUGO, .mode = S_IRUGO,
#ifdef CONFIG_DEBUG_LOCK_ALLOC
.ignore_lockdep = 1,
#endif
}, },
.show = amdgpu_ras_sysfs_read, .show = amdgpu_ras_sysfs_read,
}; };
sysfs_attr_init(&obj->sysfs_attr.attr);
if (sysfs_add_file_to_group(&adev->dev->kobj, if (sysfs_add_file_to_group(&adev->dev->kobj,
&obj->sysfs_attr.attr, &obj->sysfs_attr.attr,