diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2009-09-15 16:57:38 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-05 17:47:09 -0500 |
commit | 1df4b35b61df27fc5b173fe2789d976e40e1dc22 (patch) | |
tree | 2b858f084e1fe1267ca6d0dacc6655b611f7178e /drivers/gpu/drm/i915 | |
parent | 03f77ea5972e6a2363152aec692744cac824daba (diff) |
drm/i915: kill i915_lp_ring_sync
It's not needed anymore.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index fd6362ea865c..f9f339aafdee 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -811,7 +811,6 @@ int i915_gem_idle(struct drm_device *dev); | |||
811 | uint32_t i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | 811 | uint32_t i915_add_request(struct drm_device *dev, struct drm_file *file_priv, |
812 | uint32_t flush_domains); | 812 | uint32_t flush_domains); |
813 | int i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible); | 813 | int i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible); |
814 | int i915_lp_ring_sync(struct drm_device *dev); | ||
815 | int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); | 814 | int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); |
816 | int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, | 815 | int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, |
817 | int write); | 816 | int write); |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5e579a41b6ad..19d25e5d8608 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1890,24 +1890,6 @@ i915_wait_request(struct drm_device *dev, uint32_t seqno) | |||
1890 | return i915_do_wait_request(dev, seqno, 1); | 1890 | return i915_do_wait_request(dev, seqno, 1); |
1891 | } | 1891 | } |
1892 | 1892 | ||
1893 | /** | ||
1894 | * Waits for the ring to finish up to the latest request. Usefull for waiting | ||
1895 | * for flip events, e.g for the overlay support. */ | ||
1896 | int i915_lp_ring_sync(struct drm_device *dev) | ||
1897 | { | ||
1898 | uint32_t seqno; | ||
1899 | int ret; | ||
1900 | |||
1901 | seqno = i915_add_request(dev, NULL, 0); | ||
1902 | |||
1903 | if (seqno == 0) | ||
1904 | return -ENOMEM; | ||
1905 | |||
1906 | ret = i915_do_wait_request(dev, seqno, 0); | ||
1907 | BUG_ON(ret == -ERESTARTSYS); | ||
1908 | return ret; | ||
1909 | } | ||
1910 | |||
1911 | static void | 1893 | static void |
1912 | i915_gem_flush(struct drm_device *dev, | 1894 | i915_gem_flush(struct drm_device *dev, |
1913 | uint32_t invalidate_domains, | 1895 | uint32_t invalidate_domains, |