[PATCH] drm/amdgpu/pm: Remove gpu_od if it's an empty directory

[PATCH] drm/amdgpu/pm: Remove gpu_od if it's an empty directory

[Ma Jun]

gpu_od should be removed if it's an empty directory

Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
Reported-by: Yang Wang <kevinyang.wang@amd.com>
---
 drivers/gpu/drm/amd/pm/amdgpu_pm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index a20e03e69d38..0c13e5520e77 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -4338,6 +4338,13 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
 		}
 	}
 
+	/*
+	 * If gpu_od is the first member in the list, that means gpu_od is an
+	 * empty directory, so remove it.
+	 */
+	if (list_is_first(&top_set->entry, &adev->pm.od_kobj_list))
+		goto err_out;
+
 	return 0;
 
 err_out:
-- 
2.34.1

RE: [PATCH] drm/amdgpu/pm: Remove gpu_od if it's an empty directory

[Wang, Yang(Kevin)]

Reviewed-by: Yang Wang <kevinyang.wang@amd.com>

Best Regards,
Kevin

-----Original Message-----
From: Ma, Jun <Jun.Ma2@amd.com> 
Sent: 2024年4月17日 13:54
To: amd-gfx@lists.freedesktop.org
Cc: Feng, Kenneth <Kenneth.Feng@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Wang, Yang(Kevin) <KevinYang.Wang@amd.com>; Lazar, Lijo <Lijo.Lazar@amd.com>; Ma, Jun <Jun.Ma2@amd.com>
Subject: [PATCH] drm/amdgpu/pm: Remove gpu_od if it's an empty directory

gpu_od should be removed if it's an empty directory

Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
Reported-by: Yang Wang <kevinyang.wang@amd.com>
---
 drivers/gpu/drm/amd/pm/amdgpu_pm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index a20e03e69d38..0c13e5520e77 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -4338,6 +4338,13 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
 		}
 	}
 
+	/*
+	 * If gpu_od is the first member in the list, that means gpu_od is an
+	 * empty directory, so remove it.
+	 */
+	if (list_is_first(&top_set->entry, &adev->pm.od_kobj_list))
+		goto err_out;
+
 	return 0;
 
 err_out:
-- 
2.34.1

Re: [PATCH] drm/amdgpu/pm: Remove gpu_od if it's an empty directory

[Lazar, Lijo]

On 4/17/2024 11:23 AM, Ma Jun wrote:
> gpu_od should be removed if it's an empty directory
> 
> Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
> Reported-by: Yang Wang <kevinyang.wang@amd.com>
> ---
>  drivers/gpu/drm/amd/pm/amdgpu_pm.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
> index a20e03e69d38..0c13e5520e77 100644
> --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
> +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
> @@ -4338,6 +4338,13 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
>  		}
>  	}
>  
> +	/*
> +	 * If gpu_od is the first member in the list, that means gpu_od is an
> +	 * empty directory, so remove it.
> +	 */
> +	if (list_is_first(&top_set->entry, &adev->pm.od_kobj_list))

Instead of assuming any order, what about using "list_is_singular" - if
this is the only entry in the list?

Thanks,
Lijo
> +		goto err_out;
> +
>  	return 0;
>  
>  err_out:

Re: [PATCH] drm/amdgpu/pm: Remove gpu_od if it's an empty directory

[Ma, Jun]

On 4/17/2024 7:52 PM, Lazar, Lijo wrote:
> 
> 
> On 4/17/2024 11:23 AM, Ma Jun wrote:
>> gpu_od should be removed if it's an empty directory
>>
>> Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
>> Reported-by: Yang Wang <kevinyang.wang@amd.com>
>> ---
>>  drivers/gpu/drm/amd/pm/amdgpu_pm.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
>> index a20e03e69d38..0c13e5520e77 100644
>> --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
>> +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
>> @@ -4338,6 +4338,13 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
>>  		}
>>  	}
>>  
>> +	/*
>> +	 * If gpu_od is the first member in the list, that means gpu_od is an
>> +	 * empty directory, so remove it.
>> +	 */
>> +	if (list_is_first(&top_set->entry, &adev->pm.od_kobj_list))
> 
> Instead of assuming any order, what about using "list_is_singular" - if
> this is the only entry in the list?
> 
Thanks, will update it when push.

Regards,
Ma Jun
> Thanks,
> Lijo
>> +		goto err_out;
>> +
>>  	return 0;
>>  
>>  err_out: