diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-02-25 18:01:28 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-03-06 22:46:56 +0100 |
| commit | bc6a62955f6ea6aabe26292a21dbdd67f5b89b67 (patch) | |
| tree | a2e3a7a1f45e3796ec72d47529d849f30ab099d1 /drivers/gpu/drm/radeon/si.c | |
| parent | drm/radeon: TTM must be init with cpu-visible VRAM, v2 (diff) | |
| download | linux-bc6a62955f6ea6aabe26292a21dbdd67f5b89b67.tar.xz linux-bc6a62955f6ea6aabe26292a21dbdd67f5b89b67.zip | |
drm/radeon: resume old pm late
Moving the pm resume up in the init order to fix
dpm seems to have regressed somes cases with the old
pm code. Move it back to late resume.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 83578324e5d1..9a124d0608b3 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -6618,7 +6618,8 @@ int si_resume(struct radeon_device *rdev) /* init golden registers */ si_init_golden_registers(rdev); - radeon_pm_resume(rdev); + if (rdev->pm.pm_method == PM_METHOD_DPM) + radeon_pm_resume(rdev); rdev->accel_working = true; r = si_startup(rdev); |