Skip to contentSkip to conversation

Patch "drm/amd/powerplay: fix mclk not switching back after multi-head was disabled" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 28, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

drm/amd/powerplay: fix mclk not switching back after multi-head was disabled

to the 4.8-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-mclk-not-switching-back-after-multi-head-was-disabled.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9716ebc38dfabe6c8e5e3c809e9f3c61dd3740f9 Mon Sep 17 00:00:00 2001

From: Rex Zhu <[email protected]>
Date: Wed, 14 Sep 2016 13:20:34 +0800
Subject: drm/amd/powerplay: fix mclk not switching back after multi-head was disabled

From: Rex Zhu <[email protected]>

commit 9716ebc38dfabe6c8e5e3c809e9f3c61dd3740f9 upstream.

---
 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c |    2 ++
 drivers/gpu/drm/amd/powerplay/eventmgr/psm.c               |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c +2 -0
@@ -262,6 +262,8 @@ static const pem_event_action * const di
 	unblock_adjust_power_state_tasks,
 	set_cpu_power_state,
 	notify_hw_power_source_tasks,
+	get_2d_performance_state_tasks,
+	set_performance_state_tasks,
 	/* updateDALConfigurationTasks,
 	variBrightDisplayConfigurationChangeTasks, */
 	adjust_power_state_tasks,
drivers/gpu/drm/amd/powerplay/eventmgr/psm.c +2 -1
@@ -100,11 +100,12 @@ int psm_adjust_power_state_dynamic(struc
 	if (requested == NULL)
 		return 0;
 
+	phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
+
 	if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr, &pcurrent->hardware, &requested->hardware, &equal)))
 		equal = false;
 
 	if (!equal || phm_check_smc_update_required_for_display_configuration(hwmgr)) {
-		phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
 		phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
 		hwmgr->current_ps = requested;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/drm-amd-powerplay-fix-mclk-not-switching-back-after-multi-head-was-disabled.patch queue-4.8/drm-amdgpu-change-vblank_time-s-calculation-method-to-reduce-computational-error.patch