diff options
author | Monk Liu <Monk.Liu@amd.com> | 2017-10-17 03:11:12 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-04 16:41:31 -0500 |
commit | 13a752e3a246493bfaba0cf0e0f376672ebb734c (patch) | |
tree | e5ccbb7c947c16d6614bc40081a021173c956787 /drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | |
parent | 5740682e66cef57626a328d237698cad329c0449 (diff) |
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 <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index b7510bf6bc0f..733c64cbd1c8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | |||
@@ -115,8 +115,6 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev) | |||
115 | adev->enable_virtual_display = true; | 115 | adev->enable_virtual_display = true; |
116 | adev->cg_flags = 0; | 116 | adev->cg_flags = 0; |
117 | adev->pg_flags = 0; | 117 | adev->pg_flags = 0; |
118 | |||
119 | mutex_init(&adev->virt.lock_reset); | ||
120 | } | 118 | } |
121 | 119 | ||
122 | uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) | 120 | uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) |