diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-07 08:41:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-07 08:41:12 +1000 |
| commit | 7a4ee320cd33468e251f84631ff3b79fa6b6eb14 (patch) | |
| tree | f2ae2a2771680a6fb54fec0e83861dd56e59801c /drivers/gpu/drm/radeon/rv515.c | |
| parent | 6d7c2a672fdc74082847f5c5c735b6ed7e734b2c (diff) | |
| parent | 13714323f83ffa5a772fe0d8b74e0fa32ee08819 (diff) | |
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
a few more radeon fixes.
* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon/dpm: fix typo in EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters
drm/radeon/cik: fix typo in documentation
drm/radeon: silence GCC warning on 32 bit
drm/radeon: resume old pm late
drm/radeon: TTM must be init with cpu-visible VRAM, v2
Diffstat (limited to 'drivers/gpu/drm/radeon/rv515.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv515.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index 98e8138ff779..237dd29d9f1c 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -586,8 +586,6 @@ int rv515_resume(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); - radeon_pm_resume(rdev); - rdev->accel_working = true; r = rv515_startup(rdev); if (r) { |