Commit 53e9d836 authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amdgpu: drop pm_sysfs_en flag from amdgpu_device structure 



pm_sysfs_en is overlapped with pm.sysfs_initialized, so drop it
for simplifying code(no functional change).

Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d6530c33

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,6 @@ struct amdgpu_device { 
	bool                            in_runpm;

	bool                            has_pr3;



	bool                            pm_sysfs_en;

	bool                            ucode_sysfs_en;

	bool                            psp_sysfs_en;

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+3 −6
Original line number Diff line number Diff line
@@ -3863,11 +3863,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	adev->mm_stats.log2_max_MBps = ilog2(max(1u, max_MBps));



	r = amdgpu_pm_sysfs_init(adev);

	if (r) {

		adev->pm_sysfs_en = false;

		DRM_ERROR("registering pm debugfs failed (%d).\n", r);

	} else

		adev->pm_sysfs_en = true;

	if (r)

		DRM_ERROR("registering pm sysfs failed (%d).\n", r);



	r = amdgpu_ucode_sysfs_init(adev);

	if (r) {
@@ -4013,7 +4010,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
	if (adev->mman.initialized)

		drain_workqueue(adev->mman.bdev.wq);



	if (adev->pm_sysfs_en)

	if (adev->pm.sysfs_initialized)

		amdgpu_pm_sysfs_fini(adev);

	if (adev->ucode_sysfs_en)

		amdgpu_ucode_sysfs_fini(adev);