diff options
author | Monk Liu | 2017-10-17 11:51:41 +0200 |
---|---|---|
committer | Alex Deucher | 2017-12-04 22:41:31 +0100 |
commit | 503846e0836a62f6efd536a4c495917c1a50b345 (patch) | |
tree | 8692a75a86dbae7fdc5a4ad48068201296513663 | |
parent | drm/amdgpu:cleanup in_sriov_reset and lock_reset (diff) | |
download | kernel-qcow2-linux-503846e0836a62f6efd536a4c495917c1a50b345.tar.gz kernel-qcow2-linux-503846e0836a62f6efd536a4c495917c1a50b345.tar.xz kernel-qcow2-linux-503846e0836a62f6efd536a4c495917c1a50b345.zip |
drm/amdgpu:cleanup ucode_init_bo
1,no sriov check since gpu recover is unified
2,need CPU_ACCESS_REQUIRED flag for VRAM if SRIOV
because otherwise after following PIN the first allocated
VRAM bo is wasted due to some TTM mgr reason.
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index edc37cc80644..ab9b2d4461a1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -370,10 +370,10 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev) return 0; } - if (!amdgpu_sriov_vf(adev) || !adev->in_gpu_reset) { + if (!adev->in_gpu_reset) { err = amdgpu_bo_create(adev, adev->firmware.fw_size, PAGE_SIZE, true, amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT, - AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, + AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS|AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED, NULL, NULL, 0, bo); if (err) { dev_err(adev->dev, "(%d) Firmware buffer allocate failed\n", err); |