summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMa Jun <Jun.Ma2@amd.com>2024-04-16 17:30:12 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-05-02 16:35:29 +0200
commit9fcb0bb45e6a9427fb09c633f480827ca2d19a40 (patch)
tree0d4fef5c1e88c799274d25efebb8bf0f9e469a2e
parentbd783afd31e7052df58d6538d850e5ea3d461404 (diff)
downloadlinux-stable-9fcb0bb45e6a9427fb09c633f480827ca2d19a40.tar.gz
linux-stable-9fcb0bb45e6a9427fb09c633f480827ca2d19a40.tar.bz2
linux-stable-9fcb0bb45e6a9427fb09c633f480827ca2d19a40.zip
drm/amdgpu/pm: Remove gpu_od if it's an empty directory
commit 0e95ed6452cb079cf9587c774a475a7d83c7e040 upstream. 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> Reviewed-by: Yang Wang <kevinyang.wang@amd.com> Suggested-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/pm/amdgpu_pm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 39c5e1dfa275..b4698f985600 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -4217,6 +4217,13 @@ static int amdgpu_od_set_init(struct amdgpu_device *adev)
}
}
+ /*
+ * If gpu_od is the only member in the list, that means gpu_od is an
+ * empty directory, so remove it.
+ */
+ if (list_is_singular(&adev->pm.od_kobj_list))
+ goto err_out;
+
return 0;
err_out: