From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Message-ID: <1457548648.8149.6.camel@canonical.com>
Subject: Re: [PATCH 4.2.y-ckt 195/273] drm/radeon/pm: adjust display
 configuration after powerstate
From: Kamal Mostafa <kamal@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com
Cc: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 09 Mar 2016 10:37:28 -0800
In-Reply-To: <1457391064-6660-196-git-send-email-kamal@canonical.com>
References: <1457391064-6660-1-git-send-email-kamal@canonical.com>
	 <1457391064-6660-196-git-send-email-kamal@canonical.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Mon, 2016-03-07 at 14:49 -0800, Kamal Mostafa wrote:
> 4.2.8-ckt5 -stable review patch.  If anyone has any objections,
> please let me know.

I'm dropping this patch from 4.2-stable, per
https://lkml.org/lkml/2016/3/9/406

 -Kamal

> ---8<------------------------------------------------------------
> 
> From: Alex Deucher <alexander.deucher@amd.com>
> 
> commit 39d4275058baf53e89203407bf3841ff2c74fa32 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: Kamal Mostafa <kamal@canonical.com>
> ---
>  drivers/gpu/drm/radeon/radeon_pm.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_pm.c
> b/drivers/gpu/drm/radeon/radeon_pm.c
> index 6e012f0..77f15a1 100644
> --- a/drivers/gpu/drm/radeon/radeon_pm.c
> +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> @@ -1079,8 +1079,6 @@ force:
>  
>  	/* update display watermarks based on new power state */
>  	radeon_bandwidth_update(rdev);
> -	/* update displays */
> -	radeon_dpm_display_configuration_changed(rdev);
>  
>  	rdev->pm.dpm.current_active_crtcs = rdev-
> >pm.dpm.new_active_crtcs;
>  	rdev->pm.dpm.current_active_crtc_count = rdev-
> >pm.dpm.new_active_crtc_count;
> @@ -1101,6 +1099,9 @@ force:
>  
>  	radeon_dpm_post_set_power_state(rdev);
>  
> +	/* update displays */
> +	radeon_dpm_display_configuration_changed(rdev);
> +
>  	if (rdev->asic->dpm.force_performance_level) {
>  		if (rdev->pm.dpm.thermal_active) {
>  			enum radeon_dpm_forced_level level = rdev-
> >pm.dpm.forced_level;