Patch "drm/amdgpu: add missing dpm check for KV dpm late init" has been added to the 4.2-stable tree

Patch "drm/amdgpu: add missing dpm check for KV dpm late init" has been added to the 4.2-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

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

to the 4.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-amdgpu-add-missing-dpm-check-for-kv-dpm-late-init.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 677c884ff6370add1360e2b9558285355ebe2b36 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 19 Oct 2015 15:54:21 -0400
Subject: drm/amdgpu: add missing dpm check for KV dpm late init

From: Alex Deucher <alexander.deucher@amd.com>

commit 677c884ff6370add1360e2b9558285355ebe2b36 upstream.

Skip dpm late init if dpm is disabled.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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


Patches currently in stable-queue which might be from alexander.deucher@amd.com are

queue-4.2/drm-radeon-move-bl-encoder-assignment-into-bl-init.patch
queue-4.2/drm-amdgpu-add-missing-dpm-check-for-kv-dpm-late-init.patch
queue-4.2/drm-radeon-fix-dpms-when-driver-backlight-control-is-disabled.patch
queue-4.2/drm-amdgpu-don-t-try-to-recreate-sysfs-entries-on-resume.patch
queue-4.2/drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch
queue-4.2/drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch