Patch "drm/amdgpu/pm: adjust display configuration after powerstate" has been added to the 4.4-stable tree

Patch "drm/amdgpu/pm: adjust display configuration after powerstate" has been added to the 4.4-stable tree

[gregkh]

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

    drm/amdgpu/pm: adjust display configuration after powerstate

to the 4.4-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-pm-adjust-display-configuration-after-powerstate.patch
and it can be found in the queue-4.4 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 8e7cedc6f7fe762ffe6e348502be34b11fa79298 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 19 Feb 2016 17:55:31 -0500
Subject: drm/amdgpu/pm: adjust display configuration after powerstate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

commit 8e7cedc6f7fe762ffe6e348502be34b11fa79298 upstream.

set_power_state defaults to no displays, so we need to update
the display configuration after setting up the powerstate on the
first call. In most cases this is not an issue since ends up
getting called multiple times at any given modeset and the proper
order is achieved in the display changed handling at the top of
the function.

Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Jordan Lazare <Jordan.Lazare@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -595,8 +595,6 @@ force:
 
 	/* update display watermarks based on new power state */
 	amdgpu_display_bandwidth_update(adev);
-	/* update displays */
-	amdgpu_dpm_display_configuration_changed(adev);
 
 	adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs;
 	adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count;
@@ -616,6 +614,9 @@ force:
 
 	amdgpu_dpm_post_set_power_state(adev);
 
+	/* update displays */
+	amdgpu_dpm_display_configuration_changed(adev);
+
 	if (adev->pm.funcs->force_performance_level) {
 		if (adev->pm.dpm.thermal_active) {
 			enum amdgpu_dpm_forced_level level = adev->pm.dpm.forced_level;


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

queue-4.4/drm-amdgpu-fix-s4-resume.patch
queue-4.4/drm-amdgpu-use-post-decrement-in-error-handling.patch
queue-4.4/drm-amdgpu-drop-topaz-support-from-gmc8-module.patch
queue-4.4/drm-amdgpu-remove-exp-hardware-support-from-iceland.patch
queue-4.4/drm-add-drm_fixp_from_fraction-and-drm_fixp2int_ceil.patch
queue-4.4/drm-amdgpu-fix-issue-with-overlapping-userptrs.patch
queue-4.4/drm-amdgpu-pull-topaz-gmc-bits-into-gmc_v7.patch
queue-4.4/drm-amdgpu-the-vi-specific-exe-bit-should-only-apply-to-gmc-v8.0-above.patch
queue-4.4/drm-amdgpu-move-gmc7-support-out-of-cik-dependency.patch
queue-4.4/drm-amdgpu-iceland-use-ci-based-mc-ip.patch
queue-4.4/drm-dp-mst-process-broadcast-messages-correctly.patch
queue-4.4/drm-amdgpu-fix-amdgpu_bo_pin_restricted-vram-placing-v2.patch
queue-4.4/drm-dp-mst-fix-in-rad-element-access.patch
queue-4.4/drm-amdgpu-remove-unnecessary-forward-declaration.patch
queue-4.4/drm-dp-mst-move-guid-storage-from-mgr-port-to-only-mst-branch.patch
queue-4.4/drm-amdgpu-fix-tonga-smu-resume.patch
queue-4.4/drm-amdgpu-don-t-load-mec2-on-topaz.patch
queue-4.4/drm-amdgpu-no-need-to-load-mc-firmware-on-fiji.patch
queue-4.4/drm-amdgpu-pm-adjust-display-configuration-after-powerstate.patch
queue-4.4/drm-dp-mst-always-send-reply-for-up-request.patch
queue-4.4/drm-amdgpu-don-t-hang-in-amdgpu_flip_work_func-on-disabled-crtc.patch
queue-4.4/drm-amdgpu-call-hpd_irq_event-on-resume.patch
queue-4.4/drm-dp-mst-calculate-mst-pbn-with-31.32-fixed-point.patch
queue-4.4/drm-amdgpu-hold-reference-to-fences-in-amdgpu_sa_bo_new-v2.patch
queue-4.4/drm-dp-mst-fix-in-mstb-rad-initialization.patch
queue-4.4/drm-dp-mst-reverse-order-of-mst-enable-and-clearing-vc-payload-table.patch