[PATCH 4.2 039/110] drm/amdgpu: add missing dpm check for KV dpm late init

From: Greg Kroah-Hartman
Date: Fri Nov 06 2015 - 15:45:55 EST

4.2-stable review patch. If anyone has any objections, please let me know.


From: Alex Deucher <alexander.deucher@xxxxxxx>

commit 677c884ff6370add1360e2b9558285355ebe2b36 upstream.

Skip dpm late init if dpm is disabled.

Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 3 +++
1 file changed, 3 insertions(+)

--- 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)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/