diff options
author | Christian König <deathsimple@vodafone.de> | 2012-08-06 12:57:44 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2012-09-20 13:10:38 -0400 |
commit | 4bf3dd9264cfb71f18714fcf2f810e276a44170b (patch) | |
tree | 6081b06a18acbaf0c2fe91907c310f1e9df76dc4 /drivers/gpu/drm/radeon/radeon.h | |
parent | 1f0e29435386e42c942ee8385d10dbfc814f5cfe (diff) |
drm/radeon: cleanup VM id handling a bit
Store a reference to the VM into the IB structure, that
makes calculating the IBs address a bit less complicated.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index a1c4d4dac7df..a5470e793043 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -592,7 +592,7 @@ struct radeon_ib { | |||
592 | uint32_t *ptr; | 592 | uint32_t *ptr; |
593 | int ring; | 593 | int ring; |
594 | struct radeon_fence *fence; | 594 | struct radeon_fence *fence; |
595 | unsigned vm_id; | 595 | struct radeon_vm *vm; |
596 | bool is_const_ib; | 596 | bool is_const_ib; |
597 | struct radeon_fence *sync_to[RADEON_NUM_RINGS]; | 597 | struct radeon_fence *sync_to[RADEON_NUM_RINGS]; |
598 | struct radeon_semaphore *semaphore; | 598 | struct radeon_semaphore *semaphore; |
@@ -734,7 +734,8 @@ struct si_rlc { | |||
734 | }; | 734 | }; |
735 | 735 | ||
736 | int radeon_ib_get(struct radeon_device *rdev, int ring, | 736 | int radeon_ib_get(struct radeon_device *rdev, int ring, |
737 | struct radeon_ib *ib, unsigned size); | 737 | struct radeon_ib *ib, struct radeon_vm *vm, |
738 | unsigned size); | ||
738 | void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib); | 739 | void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib); |
739 | int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib, | 740 | int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib, |
740 | struct radeon_ib *const_ib); | 741 | struct radeon_ib *const_ib); |