diff options
| author | Dave Airlie | 2014-03-06 23:41:12 +0100 |
|---|---|---|
| committer | Dave Airlie | 2014-03-06 23:41:12 +0100 |
| commit | 7a4ee320cd33468e251f84631ff3b79fa6b6eb14 (patch) | |
| tree | f2ae2a2771680a6fb54fec0e83861dd56e59801c /drivers/gpu/drm/radeon/cik.c | |
| parent | Merge tag 'drm-intel-fixes-2014-03-04' of ssh://git.freedesktop.org/git/drm-i... (diff) | |
| parent | drm/radeon/dpm: fix typo in EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters (diff) | |
| download | kernel-qcow2-linux-7a4ee320cd33468e251f84631ff3b79fa6b6eb14.tar.gz kernel-qcow2-linux-7a4ee320cd33468e251f84631ff3b79fa6b6eb14.tar.xz kernel-qcow2-linux-7a4ee320cd33468e251f84631ff3b79fa6b6eb14.zip | |
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/cik.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index e6419ca7cd37..e22be8458d92 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -3046,7 +3046,7 @@ static u32 cik_create_bitmask(u32 bit_width) } /** - * cik_select_se_sh - select which SE, SH to address + * cik_get_rb_disabled - computes the mask of disabled RBs * * @rdev: radeon_device pointer * @max_rb_num: max RBs (render backends) for the asic @@ -7902,7 +7902,8 @@ int cik_resume(struct radeon_device *rdev) /* init golden registers */ cik_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 = cik_startup(rdev); |