diff options
| author | Monk Liu <[email protected]> | 2017-10-17 07:11:12 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2017-12-04 21:41:31 +0000 |
| commit | 13a752e3a246493bfaba0cf0e0f376672ebb734c (patch) | |
| tree | e5ccbb7c947c16d6614bc40081a021173c956787 /drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | |
| parent | drm/amdgpu:implement new GPU recover(v3) (diff) | |
| download | kernel-13a752e3a246493bfaba0cf0e0f376672ebb734c.tar.gz kernel-13a752e3a246493bfaba0cf0e0f376672ebb734c.zip | |
drm/amdgpu:cleanup in_sriov_reset and lock_reset
since now gpu reset is unified with gpu_recover
for both bare-metal and SR-IOV:
1)rename in_sriov_reset to in_gpu_reset
2)move lock_reset from adev->virt to adev
Signed-off-by: Monk Liu <[email protected]>
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index 65649026b836..edc37cc80644 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -370,7 +370,7 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev) return 0; } - if (!amdgpu_sriov_vf(adev) || !adev->in_sriov_reset) { + if (!amdgpu_sriov_vf(adev) || !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, |