diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-05-02 13:12:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-05-02 13:12:31 +0200 |
| commit | ad112b3a759cefc245695f7e612f17e6f38d2cc1 (patch) | |
| tree | d5fa837d0f996dbf15e4fd89a7f89b9b660f5796 /drivers/gpu/drm/amd/pm/amdgpu_pm.c | |
| parent | 854dd99b5ddc9d90e31e5f112462a5994dd31810 (diff) | |
| parent | e67572cd2204894179d89bd7b984072f19313b03 (diff) | |
Merge tag 'v6.9-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/pm/amdgpu_pm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/pm/amdgpu_pm.c | 7 |
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 f09b9d49297e..bbd0169010c2 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -4261,6 +4261,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: |