diff options
author | Christian König <christian.koenig@amd.com> | 2016-02-01 06:53:58 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-12 15:35:16 -0500 |
commit | 2bd9ccfa75e96ba278b96d817bc2135eb761adbd (patch) | |
tree | 03c099bd0178fb166a07b107b827da4346da5b7e /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | c41d271d751ea023f67f1ea755e144b49079b6d5 (diff) |
drm/amdgpu: use per VM entity for page table updates (v2)
Updates from different VMs can be processed independently.
v2: agd: rebase on upstream
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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 99e660fec190..5947a95ac853 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -800,7 +800,8 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, | |||
800 | struct amdgpu_job **job); | 800 | struct amdgpu_job **job); |
801 | void amdgpu_job_free(struct amdgpu_job *job); | 801 | void amdgpu_job_free(struct amdgpu_job *job); |
802 | int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring, | 802 | int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring, |
803 | void *owner, struct fence **f); | 803 | struct amd_sched_entity *entity, void *owner, |
804 | struct fence **f); | ||
804 | 805 | ||
805 | struct amdgpu_ring { | 806 | struct amdgpu_ring { |
806 | struct amdgpu_device *adev; | 807 | struct amdgpu_device *adev; |
@@ -917,6 +918,9 @@ struct amdgpu_vm { | |||
917 | 918 | ||
918 | /* protecting freed */ | 919 | /* protecting freed */ |
919 | spinlock_t freed_lock; | 920 | spinlock_t freed_lock; |
921 | |||
922 | /* Scheduler entity for page table updates */ | ||
923 | struct amd_sched_entity entity; | ||
920 | }; | 924 | }; |
921 | 925 | ||
922 | struct amdgpu_vm_manager_id { | 926 | struct amdgpu_vm_manager_id { |