Patch "drm/amdgpu: don't try to recreate sysfs entries on resume" has been added to the 4.2-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/amdgpu: don't try to recreate sysfs entries on resume
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-don-t-try-to-recreate-sysfs-entries-on-resume.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c86f5ebfbd147d1a228ab89ee1658e18939bd7adMon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Fri, 23 Oct 2015 10:45:14 -0400
Subject: drm/amdgpu: don't try to recreate sysfs entries on resume
From: Alex Deucher <[email protected]>
commit c86f5ebfbd147d1a228ab89ee1658e18939bd7ad upstream.
Fixes an error on resume caused by:fa022a9b65d2886486a022fd66b20c823cd76ad9
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1583,6 +1583,7 @@ struct amdgpu_pm {u8 fan_max_rpm;/* dpm */ bool dpm_enabled; +bool sysfs_initialized;struct amdgpu_dpm dpm;const struct firmware *fw;/* SMC firmware */ uint32_t fw_version;
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +5 -0
@@ -693,6 +693,9 @@ int amdgpu_pm_sysfs_init(struct amdgpu_d {int ret; +if (adev->pm.sysfs_initialized) +return 0 ; +if (adev->pm.funcs->get_temperature ==NULL )return 0 ; adev->pm.int_hwmon_dev = hwmon_device_register_with_groups(adev->dev,
@@ -721,6 +724,8 @@ int amdgpu_pm_sysfs_init(struct amdgpu_dreturn ret; } + adev->pm.sysfs_initialized = true; +return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.2/drm-radeon-move-bl-encoder-assignment-into-bl-init.patch queue-4.2/drm-amdgpu-add-missing-dpm-check-for-kv-dpm-late-init.patch queue-4.2/drm-radeon-fix-dpms-when-driver-backlight-control-is-disabled.patch queue-4.2/drm-amdgpu-don-t-try-to-recreate-sysfs-entries-on-resume.patch queue-4.2/drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch queue-4.2/drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch