From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 19 Oct 2015 19:54:21 +0000 (-0400)
Subject: drm/amdgpu: add missing dpm check for KV dpm late init
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~5725^2^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=677c884ff6370add1360e2b9558285355ebe2b36;p=mirror_ubuntu-zesty-kernel.git

drm/amdgpu: add missing dpm check for KV dpm late init

Skip dpm late init if dpm is disabled.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---

diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
index 9745ed3a9aef..7e9154c7f1db 100644
--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
@@ -2997,6 +2997,9 @@ static int kv_dpm_late_init(void *handle)
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 	int ret;
 
+	if (!amdgpu_dpm)
+		return 0;
+
 	/* init the sysfs and debugfs files late */
 	ret = amdgpu_pm_sysfs_init(adev);
 	if (ret)