diff options
author | Christian König <christian.koenig@amd.com> | 2015-10-22 05:55:58 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-10-30 01:55:12 -0400 |
commit | d52832986aa52ea18940e817d5d04c081c2f42f3 (patch) | |
tree | b2b61608e7b2a27643dffff7e2eb5794d7b992e9 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 8120b61fdf3d3aa31d6b7e4a4f633bec1d2edd38 (diff) |
drm/amdgpu: use common fences for VMID management v2
v2: add missing NULL check.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 6d9c929e6d51..371994c4645f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -970,7 +970,7 @@ struct amdgpu_vm_id { | |||
970 | /* last flushed PD/PT update */ | 970 | /* last flushed PD/PT update */ |
971 | struct fence *flushed_updates; | 971 | struct fence *flushed_updates; |
972 | /* last use of vmid */ | 972 | /* last use of vmid */ |
973 | struct amdgpu_fence *last_id_use; | 973 | struct fence *last_id_use; |
974 | }; | 974 | }; |
975 | 975 | ||
976 | struct amdgpu_vm { | 976 | struct amdgpu_vm { |
@@ -1003,7 +1003,7 @@ struct amdgpu_vm { | |||
1003 | }; | 1003 | }; |
1004 | 1004 | ||
1005 | struct amdgpu_vm_manager { | 1005 | struct amdgpu_vm_manager { |
1006 | struct amdgpu_fence *active[AMDGPU_NUM_VM]; | 1006 | struct fence *active[AMDGPU_NUM_VM]; |
1007 | uint32_t max_pfn; | 1007 | uint32_t max_pfn; |
1008 | /* number of VMIDs */ | 1008 | /* number of VMIDs */ |
1009 | unsigned nvm; | 1009 | unsigned nvm; |