Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: don't try to recreate sysfs entries on resume

Fixes an error on resume caused by:
fa022a9b65d2886486a022fd66b20c823cd76ad9

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

+6
+1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 1654 1654 u8 fan_max_rpm; 1655 1655 /* dpm */ 1656 1656 bool dpm_enabled; 1657 + bool sysfs_initialized; 1657 1658 struct amdgpu_dpm dpm; 1658 1659 const struct firmware *fw; /* SMC firmware */ 1659 1660 uint32_t fw_version;
+5
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
··· 695 695 { 696 696 int ret; 697 697 698 + if (adev->pm.sysfs_initialized) 699 + return 0; 700 + 698 701 if (adev->pm.funcs->get_temperature == NULL) 699 702 return 0; 700 703 adev->pm.int_hwmon_dev = hwmon_device_register_with_groups(adev->dev, ··· 725 722 DRM_ERROR("Failed to register debugfs file for dpm!\n"); 726 723 return ret; 727 724 } 725 + 726 + adev->pm.sysfs_initialized = true; 728 727 729 728 return 0; 730 729 }