[PATCH] drm/radeon/dpm: resume fixes for some systems

[Christian König]

Am 30.05.2014 18:40, schrieb Alex Deucher:
> Setting the power state prior to restoring the display
> hardware leads to blank screens on some systems.  Drop
> the power state set from dpm resume.  The power state
> will get set as part of the mode set sequence.  Also
> add an explicit power state set after mode set resume
> to cover PX and headless systems.
>
> bug:
> https://bugzilla.kernel.org/show_bug.cgi?id=76761
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: stable at vger.kernel.org

I've just added this to my 3.15 queue, but it looks like Linus is going 
to tag 3.15 tomorrow and Dave already send out his most likely last pull 
request.

Going to send out another pull request in the evening if I can get the 
VM crashes resolved as well, but I doubt it will be included.

Christian.

> ---
>   drivers/gpu/drm/radeon/atombios_crtc.c | 6 ++----
>   drivers/gpu/drm/radeon/radeon_device.c | 5 +++++
>   drivers/gpu/drm/radeon/radeon_pm.c     | 1 -
>   3 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
> index 998435d..baa1459 100644
> --- a/drivers/gpu/drm/radeon/atombios_crtc.c
> +++ b/drivers/gpu/drm/radeon/atombios_crtc.c
> @@ -270,8 +270,6 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
>   	switch (mode) {
>   	case DRM_MODE_DPMS_ON:
>   		radeon_crtc->enabled = true;
> -		/* adjust pm to dpms changes BEFORE enabling crtcs */
> -		radeon_pm_compute_clocks(rdev);
>   		atombios_enable_crtc(crtc, ATOM_ENABLE);
>   		if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev))
>   			atombios_enable_crtc_memreq(crtc, ATOM_ENABLE);
> @@ -289,10 +287,10 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
>   			atombios_enable_crtc_memreq(crtc, ATOM_DISABLE);
>   		atombios_enable_crtc(crtc, ATOM_DISABLE);
>   		radeon_crtc->enabled = false;
> -		/* adjust pm to dpms changes AFTER disabling crtcs */
> -		radeon_pm_compute_clocks(rdev);
>   		break;
>   	}
> +	/* adjust pm to dpms */
> +	radeon_pm_compute_clocks(rdev);
>   }
>   
>   static void
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index 9aa1afd..20bc5af 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -1562,6 +1562,11 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
>   	}
>   
>   	drm_kms_helper_poll_enable(dev);
> +
> +	/* set the power state here in case we are a PX system or headless */
> +	if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
> +		radeon_pm_compute_clocks(rdev);
> +
>   	return 0;
>   }
>   
> diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
> index 6fac8ef..304c476 100644
> --- a/drivers/gpu/drm/radeon/radeon_pm.c
> +++ b/drivers/gpu/drm/radeon/radeon_pm.c
> @@ -1068,7 +1068,6 @@ static void radeon_pm_resume_dpm(struct radeon_device *rdev)
>   	if (ret)
>   		goto dpm_resume_fail;
>   	rdev->pm.dpm_enabled = true;
> -	radeon_pm_compute_clocks(rdev);
>   	return;
>   
>   dpm_resume_fail: