diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0187-drm-amdgpu-fix-amdgpu.dpm-0-v2.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0187-drm-amdgpu-fix-amdgpu.dpm-0-v2.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/common/recipes-kernel/linux/files/0187-drm-amdgpu-fix-amdgpu.dpm-0-v2.patch b/common/recipes-kernel/linux/files/0187-drm-amdgpu-fix-amdgpu.dpm-0-v2.patch deleted file mode 100644 index de58cbeb..00000000 --- a/common/recipes-kernel/linux/files/0187-drm-amdgpu-fix-amdgpu.dpm-0-v2.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 46651cc5dbee35dd2f25a02de328d3e7310ce64b 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 0187/1050] drm/amdgpu fix amdgpu.dpm=0 (v2) - -Fix crash when disabling dpm. - -v2: agd5f: fix coding style, cleanup commit message - -Signed-off-by: Sonny Jiang <sonny.jiang@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c -index e56f54b..adf4dbc 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,12 @@ 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); - -@@ -1326,6 +1329,12 @@ 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 - |