From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51052 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752415AbcGXX6i (ORCPT ); Sun, 24 Jul 2016 19:58:38 -0400 Subject: Patch "drm/amd/powerplay: fix logic error." has been added to the 4.6-stable tree To: Rex.Zhu@amd.com, alexander.deucher@amd.com, gregkh@linuxfoundation.org Cc: , From: Date: Sun, 24 Jul 2016 16:55:48 -0700 Message-ID: <146940454797246@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 1d7b84d12af8312b52316029f1fa0fa4eac3c9e4 Mon Sep 17 00:00:00 2001 From: Rex Zhu Date: Fri, 17 Jun 2016 18:21:01 +0800 Subject: drm/amd/powerplay: fix logic error. From: Rex Zhu 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 Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- 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