projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
uvd_v1_0.c
diff --git
a/drivers/gpu/drm/radeon/uvd_v1_0.c
b/drivers/gpu/drm/radeon/uvd_v1_0.c
index
7266805
..
d4a68af
100644
(file)
--- a/
drivers/gpu/drm/radeon/uvd_v1_0.c
+++ b/
drivers/gpu/drm/radeon/uvd_v1_0.c
@@
-357,7
+357,7
@@
int uvd_v1_0_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
*
* Emit a semaphore command (either wait or signal) to the UVD ring.
*/
*
* Emit a semaphore command (either wait or signal) to the UVD ring.
*/
-
void
uvd_v1_0_semaphore_emit(struct radeon_device *rdev,
+
bool
uvd_v1_0_semaphore_emit(struct radeon_device *rdev,
struct radeon_ring *ring,
struct radeon_semaphore *semaphore,
bool emit_wait)
struct radeon_ring *ring,
struct radeon_semaphore *semaphore,
bool emit_wait)
@@
-372,6
+372,8
@@
void uvd_v1_0_semaphore_emit(struct radeon_device *rdev,
radeon_ring_write(ring, PACKET0(UVD_SEMA_CMD, 0));
radeon_ring_write(ring, emit_wait ? 1 : 0);
radeon_ring_write(ring, PACKET0(UVD_SEMA_CMD, 0));
radeon_ring_write(ring, emit_wait ? 1 : 0);
+
+ return true;
}
/**
}
/**