diff options
author | Roger.He <Hongbo.He@amd.com> | 2017-05-05 01:27:10 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-05-24 17:40:31 -0400 |
commit | 738f64ccc237f80b7673a6cc43051916eb90dc27 (patch) | |
tree | 6eb7dc7516db9f9cdf7c463643b9ec9bcf091ac7 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 455a7bc27c2118c7e0531b7502dedc80ed2f9d40 (diff) |
drm/amdgpu: extend lock range for race condition when gpu reset
to cover below case:
1. A task gart bind/unbind but not add to adev->gtt_list yet
2. at this time gpu reset, gtt only recover those gtt in adev->gtt_list
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Roger.He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 3bd709600a15..ea8ad69fa65d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -554,7 +554,7 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev); | |||
554 | void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev); | 554 | void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev); |
555 | int amdgpu_gart_init(struct amdgpu_device *adev); | 555 | int amdgpu_gart_init(struct amdgpu_device *adev); |
556 | void amdgpu_gart_fini(struct amdgpu_device *adev); | 556 | void amdgpu_gart_fini(struct amdgpu_device *adev); |
557 | void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, | 557 | int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, |
558 | int pages); | 558 | int pages); |
559 | int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, | 559 | int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, |
560 | int pages, struct page **pagelist, | 560 | int pages, struct page **pagelist, |