diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2014-05-30 18:40:15 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-02 05:33:03 +0200 |
| commit | 3640da2faa952a2e9439a254c1ce76033ca0a6dc (patch) | |
| tree | 971931907a986ca956c614b4bd3fe25d2cc1d2f5 /drivers/gpu/drm/radeon/radeon_device.c | |
| parent | drm/radeon: Resume fbcon last (diff) | |
| download | linux-3640da2faa952a2e9439a254c1ce76033ca0a6dc.tar.xz linux-3640da2faa952a2e9439a254c1ce76033ca0a6dc.zip | |
drm/radeon/dpm: resume fixes for some systems
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@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 14671406212f..2cd144c378d6 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1558,6 +1558,10 @@ 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); + if (fbcon) { radeon_fbdev_set_suspend(rdev, 0); console_unlock(); |