diff options
author | Ben Gamari <bgamari.foss@gmail.com> | 2009-09-14 17:48:43 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-17 17:35:11 -0400 |
commit | 22be172423b0007a02a06d70db8aeb4d9e64c6b3 (patch) | |
tree | c94f5cf0576193becc693e3719ac42973ab81ec5 | |
parent | 1341d655ddea37f307736af7030a3ef7c5648c31 (diff) |
drm/i915: make i915_seqno_passed non-static
We'll need it in i915_irq.c for checking whether there are outstanding
requests. Also, the function really ought to return a bool, not an int.
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 01b292003af4..933d832aeff7 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -709,6 +709,7 @@ int i915_gem_object_unbind(struct drm_gem_object *obj); | |||
709 | void i915_gem_release_mmap(struct drm_gem_object *obj); | 709 | void i915_gem_release_mmap(struct drm_gem_object *obj); |
710 | void i915_gem_lastclose(struct drm_device *dev); | 710 | void i915_gem_lastclose(struct drm_device *dev); |
711 | uint32_t i915_get_gem_seqno(struct drm_device *dev); | 711 | uint32_t i915_get_gem_seqno(struct drm_device *dev); |
712 | bool i915_seqno_passed(uint32_t seq1, uint32_t seq2); | ||
712 | int i915_gem_object_get_fence_reg(struct drm_gem_object *obj); | 713 | int i915_gem_object_get_fence_reg(struct drm_gem_object *obj); |
713 | int i915_gem_object_put_fence_reg(struct drm_gem_object *obj); | 714 | int i915_gem_object_put_fence_reg(struct drm_gem_object *obj); |
714 | void i915_gem_retire_requests(struct drm_device *dev); | 715 | void i915_gem_retire_requests(struct drm_device *dev); |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 910051321104..c70e91b51f67 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1671,7 +1671,7 @@ out: | |||
1671 | /** | 1671 | /** |
1672 | * Returns true if seq1 is later than seq2. | 1672 | * Returns true if seq1 is later than seq2. |
1673 | */ | 1673 | */ |
1674 | static int | 1674 | bool |
1675 | i915_seqno_passed(uint32_t seq1, uint32_t seq2) | 1675 | i915_seqno_passed(uint32_t seq1, uint32_t seq2) |
1676 | { | 1676 | { |
1677 | return (int32_t)(seq1 - seq2) >= 0; | 1677 | return (int32_t)(seq1 - seq2) >= 0; |