Patch "drm/amd/powerplay: fix logic error." has been added to the 4.6-stable tree

Patch "drm/amd/powerplay: fix logic error." has been added to the 4.6-stable tree

[gregkh]

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

    drm/amd/powerplay: fix logic error.

to the 4.6-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-amd-powerplay-fix-logic-error.patch
and it can be found in the queue-4.6 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 1d7b84d12af8312b52316029f1fa0fa4eac3c9e4 Mon Sep 17 00:00:00 2001
From: Rex Zhu <Rex.Zhu@amd.com>
Date: Fri, 17 Jun 2016 18:21:01 +0800
Subject: drm/amd/powerplay: fix logic error.

From: Rex Zhu <Rex.Zhu@amd.com>

commit 1d7b84d12af8312b52316029f1fa0fa4eac3c9e4 upstream.

the error lead powerplay can't get display info in DGPU case.
store_cc6_data just implement in APU.

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

---
 drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
@@ -306,10 +306,14 @@ int phm_store_dal_configuration_data(str
 {
 	PHM_FUNC_CHECK(hwmgr);
 
-	if (hwmgr->hwmgr_func->store_cc6_data == NULL)
+	if (display_config == NULL)
 		return -EINVAL;
 
 	hwmgr->display_config = *display_config;
+
+	if (hwmgr->hwmgr_func->store_cc6_data == NULL)
+		return -EINVAL;
+
 	/* to do pass other display configuration in furture */
 
 	if (hwmgr->hwmgr_func->store_cc6_data)


Patches currently in stable-queue which might be from Rex.Zhu@amd.com are

queue-4.6/drm-amd-powerplay-fix-logic-error.patch
queue-4.6/drm-amd-powerplay-fix-bug-that-function-parameter-was-incorect.patch
queue-4.6/drm-amd-powerplay-need-to-notify-system-bios-pcie-device-ready.patch
queue-4.6/drm-amd-powerplay-incorrectly-use-of-the-function-return-value.patch