From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com ([91.189.89.112]:37407 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933844AbcCIShZ convert rfc822-to-8bit (ORCPT ); Wed, 9 Mar 2016 13:37:25 -0500 Message-ID: <1457548639.8149.5.camel@canonical.com> Subject: Re: [PATCH 3.19.y-ckt 134/196] drm/radeon/pm: adjust display configuration after powerstate From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Alex Deucher Date: Wed, 09 Mar 2016 10:37:19 -0800 In-Reply-To: <1457483454-30115-135-git-send-email-kamal@canonical.com> References: <1457483454-30115-1-git-send-email-kamal@canonical.com> <1457483454-30115-135-git-send-email-kamal@canonical.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Tue, 2016-03-08 at 16:29 -0800, Kamal Mostafa wrote: > 3.19.8-ckt16 -stable review patch.  If anyone has any objections, > please let me know. I'm dropping this patch from 3.19-stable, per https://lkml.org/lkml/2016/3/9/406  -Kamal > ---8<------------------------------------------------------------ > > From: Alex Deucher > > 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 > Acked-by: Jordan Lazare > Signed-off-by: Alex Deucher > Signed-off-by: Kamal Mostafa > --- >  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 5fc27e9..4001692 100644 > --- a/drivers/gpu/drm/radeon/radeon_pm.c > +++ b/drivers/gpu/drm/radeon/radeon_pm.c > @@ -936,8 +936,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; > @@ -958,6 +956,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; > --  > 2.7.0 > >