[PATCH] drm/amdgpu: Fix lockdep warking more gracely

[PATCH] drm/amdgpu: Fix lockdep warking more gracely

[Pan, Xinhui]

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>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 ++------
 1 file 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)
 		.attr = {
 			.name = "features",
 			.mode = S_IRUGO,
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-			.ignore_lockdep = 1,
-#endif
 		},
 			.show = amdgpu_ras_sysfs_features_read,
 	};
+	sysfs_attr_init(attrs[0]);
 
 	return sysfs_create_group(&adev->dev->kobj, &group);
 }
@@ -793,12 +791,10 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev,
 		.attr = {
 			.name = obj->fs_data.sysfs_name,
 			.mode = S_IRUGO,
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-			.ignore_lockdep = 1,
-#endif
 		},
 			.show = amdgpu_ras_sysfs_read,
 	};
+	sysfs_attr_init(&obj->sysfs_attr.attr);
 
 	if (sysfs_add_file_to_group(&adev->dev->kobj,
 				&obj->sysfs_attr.attr,
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: Fix lockdep warking more gracely

[Grodzovsky, Andrey]

Reviewed-and-Tested-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>

Andrey

On 3/11/19 7:57 AM, Pan, Xinhui wrote:
> 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>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 ++------
>   1 file 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)
>   		.attr = {
>   			.name = "features",
>   			.mode = S_IRUGO,
> -#ifdef CONFIG_DEBUG_LOCK_ALLOC
> -			.ignore_lockdep = 1,
> -#endif
>   		},
>   			.show = amdgpu_ras_sysfs_features_read,
>   	};
> +	sysfs_attr_init(attrs[0]);
>   
>   	return sysfs_create_group(&adev->dev->kobj, &group);
>   }
> @@ -793,12 +791,10 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev,
>   		.attr = {
>   			.name = obj->fs_data.sysfs_name,
>   			.mode = S_IRUGO,
> -#ifdef CONFIG_DEBUG_LOCK_ALLOC
> -			.ignore_lockdep = 1,
> -#endif
>   		},
>   			.show = amdgpu_ras_sysfs_read,
>   	};
> +	sysfs_attr_init(&obj->sysfs_attr.attr);
>   
>   	if (sysfs_add_file_to_group(&adev->dev->kobj,
>   				&obj->sysfs_attr.attr,
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: Fix lockdep warking more gracely

[Paul Menzel]

Dear Xinhui,


There is a typo in war*n*ing in your commit message summary.


Kind regards,

Paul
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdgpu: Fix lockdep warking more gracely

[Pan, Xinhui]

I have fixed it and pushed in the internal branch. Sorry for typo.

-----Original Message-----
From: Paul Menzel <pmenzel+amd-gfx@molgen.mpg.de> 
Sent: 2019年3月12日 0:00
To: Pan, Xinhui <Xinhui.Pan@amd.com>
Cc: amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Michel Dänzer <michel@daenzer.net>; Quan, Evan <Evan.Quan@amd.com>
Subject: Re: [PATCH] drm/amdgpu: Fix lockdep warking more gracely

Dear Xinhui,


There is a typo in war*n*ing in your commit message summary.


Kind regards,

Paul
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx