1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/0042-yocto-amd-drm-amdgpu-fix-amdgpu.dpm-0-kernel-bug-482.patch b/meta-amdfalconx86/recipes-kernel/linux/files/0042-yocto-amd-drm-amdgpu-fix-amdgpu.dpm-0-kernel-bug-482.patch
new file mode 100644
index 00000000..cff8364e
--- /dev/null
+++ b/meta-amdfalconx86/recipes-kernel/linux/files/0042-yocto-amd-drm-amdgpu-fix-amdgpu.dpm-0-kernel-bug-482.patch
@@ -0,0 +1,58 @@
+From 5ecb7c958d3c90b6b00536484526ecc538740914 Mon Sep 17 00:00:00 2001
+From: Sonny Jiang <sonny.jiang@amd.com>
+Date: Thu, 30 Apr 2015 17:12:14 -0400
+Subject: [PATCH] drm/amdgpu fix amdgpu.dpm=0 kernel bug#482
+
+Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
+Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
+index b5c8485..87e2a4f 100644
+--- a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
++++ b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
+@@ -1206,10 +1206,7 @@ static int cz_dpm_enable(struct amdgpu_device *adev)
+ 
+ static int cz_dpm_hw_init(struct amdgpu_device *adev)
+ {
+-	int ret;
+-
+-	if (!amdgpu_dpm)
+-		return 0;
++	int ret = 0;
+ 
+ 	mutex_lock(&adev->pm.mutex);
+ 
+@@ -1229,6 +1226,13 @@ static int cz_dpm_hw_init(struct amdgpu_device *adev)
+ 		return ret;
+ 	}
+ 
++	if (!amdgpu_dpm)
++	{
++		adev->pm.dpm_enabled = false;
++		mutex_unlock(&adev->pm.mutex);
++		return ret;
++	}
++
+ 	/* cz dpm setup asic */
+ 	cz_dpm_setup_asic(adev);
+ 
+@@ -1330,6 +1334,13 @@ static int cz_dpm_resume(struct amdgpu_device *adev)
+ 		return ret;
+ 	}
+ 
++	if (!amdgpu_dpm)
++	{
++		adev->pm.dpm_enabled = false;
++		mutex_unlock(&adev->pm.mutex);
++		return ret;
++	}
++
+ 	/* cz dpm setup asic */
+ 	cz_dpm_setup_asic(adev);
+ 
+-- 
+1.9.1
+