diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-03-30 15:21:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-03-30 15:21:03 +1000 |
| commit | c0ca5437c5098f70af51974e9e790260c18582a0 (patch) | |
| tree | 3c1f66ff0f061b5b4c560df4179aef090430fa2f /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
| parent | Merge branch 'feature/staging_sm5' of git://people.freedesktop.org/~sroland/linux into drm-next (diff) | |
| parent | drm/amdgpu: don't try to reserve training bo for sriov (v2) (diff) | |
| download | linux-dev-c0ca5437c5098f70af51974e9e790260c18582a0.tar.xz linux-dev-c0ca5437c5098f70af51974e9e790260c18582a0.zip | |
Merge tag 'amd-drm-next-5.7-2020-03-26' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-next-5.7-2020-03-26:
amdgpu:
- Remove a dpm quirk that is not necessary
- Fix handling of AC/DC mode in newer SMU firmwares on navi
- SR-IOV fixes
- RAS fixes
scheduler:
- Fix a race condition
radeon:
- Remove a dpm quirk that is not necessary
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200326155310.5486-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index c10ae1cdc1b9..cd6cac4c136a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1840,9 +1840,11 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) *The reserved vram for memory training must be pinned to the specified *place on the VRAM, so reserve it early. */ - r = amdgpu_ttm_training_reserve_vram_init(adev); - if (r) - return r; + if (!amdgpu_sriov_vf(adev)) { + r = amdgpu_ttm_training_reserve_vram_init(adev); + if (r) + return r; + } /* allocate memory as required for VGA * This is used for VGA emulation and pre-OS scanout buffers to |