1 files changed, 0 insertions, 54 deletions
diff --git a/common/recipes-kernel/linux/files/0640-drm-amdgpu-don-t-try-to-recreate-sysfs-entries-on-re.patch b/common/recipes-kernel/linux/files/0640-drm-amdgpu-don-t-try-to-recreate-sysfs-entries-on-re.patch
deleted file mode 100644
index 067a2643..00000000
--- a/common/recipes-kernel/linux/files/0640-drm-amdgpu-don-t-try-to-recreate-sysfs-entries-on-re.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c86f5ebfbd147d1a228ab89ee1658e18939bd7ad Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 23 Oct 2015 10:45:14 -0400
-Subject: [PATCH 0640/1565] 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
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h    | 1 +
- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 5 +++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 6647fb2..0d13e63 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -1654,6 +1654,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;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
-index ed2bbe5..22a8c7d 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
-@@ -695,6 +695,9 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)
- {
- 	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,
-@@ -723,6 +726,8 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)
- 		return ret;
- 	}
- 
-+	adev->pm.sysfs_initialized = true;
-+
- 	return 0;
- }
- 
--- 
-1.9.1
-