1 files changed, 0 insertions, 102 deletions
diff --git a/common/recipes-kernel/linux/files/0572-drm-amdgpu-add-pm-sysfs-files-late.patch b/common/recipes-kernel/linux/files/0572-drm-amdgpu-add-pm-sysfs-files-late.patch
deleted file mode 100644
index 1570c11f..00000000
--- a/common/recipes-kernel/linux/files/0572-drm-amdgpu-add-pm-sysfs-files-late.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From fa022a9b65d2886486a022fd66b20c823cd76ad9 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 30 Sep 2015 17:05:40 -0400
-Subject: [PATCH 0572/1565] drm/amdgpu: add pm sysfs files late
-
-They were added relatively early in the driver init process
-which meant that in some cases the driver was not finished
-initializing before external tools tried to use them which
-could result in a crash depending on the timing.
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
----
- drivers/gpu/drm/amd/amdgpu/ci_dpm.c |  8 +++++---
- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 10 ++++++----
- drivers/gpu/drm/amd/amdgpu/kv_dpm.c |  9 ++++++---
- 3 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
-index 82e8d07..a1a35a5 100644
---- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
-@@ -6185,6 +6185,11 @@ static int ci_dpm_late_init(void *handle)
- 	if (!amdgpu_dpm)
- 		return 0;
- 
-+	/* init the sysfs and debugfs files late */
-+	ret = amdgpu_pm_sysfs_init(adev);
-+	if (ret)
-+		return ret;
-+
- 	ret = ci_set_temperature_range(adev);
- 	if (ret)
- 		return ret;
-@@ -6232,9 +6237,6 @@ static int ci_dpm_sw_init(void *handle)
- 	adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;
- 	if (amdgpu_dpm == 1)
- 		amdgpu_pm_print_power_states(adev);
--	ret = amdgpu_pm_sysfs_init(adev);
--	if (ret)
--		goto dpm_failed;
- 	mutex_unlock(&adev->pm.mutex);
- 	DRM_INFO("amdgpu: dpm initialized\n");
- 
-diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
-index 44fa96a..2e3373e 100644
---- a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
-@@ -596,6 +596,12 @@ static int cz_dpm_late_init(void *handle)
- 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
- 
- 	if (amdgpu_dpm) {
-+		int ret;
-+		/* init the sysfs and debugfs files late */
-+		ret = amdgpu_pm_sysfs_init(adev);
-+		if (ret)
-+			return ret;
-+
- 		/* powerdown unused blocks for now */
- 		cz_dpm_powergate_uvd(adev, true);
- 		cz_dpm_powergate_vce(adev, true);
-@@ -632,10 +638,6 @@ static int cz_dpm_sw_init(void *handle)
- 	if (amdgpu_dpm == 1)
- 		amdgpu_pm_print_power_states(adev);
- 
--	ret = amdgpu_pm_sysfs_init(adev);
--	if (ret)
--		goto dpm_init_failed;
--
- 	mutex_unlock(&adev->pm.mutex);
- 	DRM_INFO("amdgpu: dpm initialized\n");
- 
-diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
-index 94ec04a..9745ed3 100644
---- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
-@@ -2995,6 +2995,12 @@ static int kv_dpm_late_init(void *handle)
- {
- 	/* powerdown unused blocks for now */
- 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-+	int ret;
-+
-+	/* init the sysfs and debugfs files late */
-+	ret = amdgpu_pm_sysfs_init(adev);
-+	if (ret)
-+		return ret;
- 
- 	kv_dpm_powergate_acp(adev, true);
- 	kv_dpm_powergate_samu(adev, true);
-@@ -3038,9 +3044,6 @@ static int kv_dpm_sw_init(void *handle)
- 	adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;
- 	if (amdgpu_dpm == 1)
- 		amdgpu_pm_print_power_states(adev);
--	ret = amdgpu_pm_sysfs_init(adev);
--	if (ret)
--		goto dpm_failed;
- 	mutex_unlock(&adev->pm.mutex);
- 	DRM_INFO("amdgpu: dpm initialized\n");
- 
--- 
-1.9.1
-