diff options
author | Christian König <deathsimple@vodafone.de> | 2011-09-23 09:11:23 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:49:46 -0500 |
commit | 7b1f2485db253aaa0081e1c5213533e166130732 (patch) | |
tree | 77f7e6517d67501108feedfa029f4ea8549a9642 /drivers/gpu/drm/radeon/radeon_semaphore.c | |
parent | 15d3332f31afd571a6d23971dbc8d8db2856e661 (diff) |
drm/radeon: make all functions work with multiple rings.
Give all asic and radeon_ring_* functions a
radeon_cp parameter, so they know the ring to work with.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_semaphore.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_semaphore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c index f7d3104de6d4..064694a67824 100644 --- a/drivers/gpu/drm/radeon/radeon_semaphore.c +++ b/drivers/gpu/drm/radeon/radeon_semaphore.c | |||
@@ -121,13 +121,13 @@ int radeon_semaphore_create(struct radeon_device *rdev, | |||
121 | void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring, | 121 | void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring, |
122 | struct radeon_semaphore *semaphore) | 122 | struct radeon_semaphore *semaphore) |
123 | { | 123 | { |
124 | radeon_semaphore_ring_emit(rdev, semaphore, ring, false); | 124 | radeon_semaphore_ring_emit(rdev, &rdev->cp, semaphore, false); |
125 | } | 125 | } |
126 | 126 | ||
127 | void radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring, | 127 | void radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring, |
128 | struct radeon_semaphore *semaphore) | 128 | struct radeon_semaphore *semaphore) |
129 | { | 129 | { |
130 | radeon_semaphore_ring_emit(rdev, semaphore, ring, true); | 130 | radeon_semaphore_ring_emit(rdev, &rdev->cp, semaphore, true); |
131 | } | 131 | } |
132 | 132 | ||
133 | void radeon_semaphore_free(struct radeon_device *rdev, | 133 | void radeon_semaphore_free(struct radeon_device *rdev, |