diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2009-09-15 16:57:36 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-05 17:47:09 -0500 |
commit | 5a5a0c64a99d7542c48c99d1a8bbb49e665842be (patch) | |
tree | f915bb581b83247df2bc508d899dd379455119e1 /drivers/gpu/drm/i915/i915_gem.c | |
parent | 240a2d12dfff98f8fa1332dc8424284d96f0801e (diff) |
drm/i915: implement fastpath for overlay flip waiting
As long as the gpu can keep up, neither the cpu (waiting for gpu)
nore the gpu (waiting for vblank to do an overlay flip) stalls.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 7d1e9adf0f4c..5e579a41b6ad 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1583,7 +1583,7 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj) | |||
1583 | * | 1583 | * |
1584 | * Returned sequence numbers are nonzero on success. | 1584 | * Returned sequence numbers are nonzero on success. |
1585 | */ | 1585 | */ |
1586 | static uint32_t | 1586 | uint32_t |
1587 | i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | 1587 | i915_add_request(struct drm_device *dev, struct drm_file *file_priv, |
1588 | uint32_t flush_domains) | 1588 | uint32_t flush_domains) |
1589 | { | 1589 | { |
@@ -1820,7 +1820,7 @@ i915_gem_retire_work_handler(struct work_struct *work) | |||
1820 | mutex_unlock(&dev->struct_mutex); | 1820 | mutex_unlock(&dev->struct_mutex); |
1821 | } | 1821 | } |
1822 | 1822 | ||
1823 | static int | 1823 | int |
1824 | i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | 1824 | i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) |
1825 | { | 1825 | { |
1826 | drm_i915_private_t *dev_priv = dev->dev_private; | 1826 | drm_i915_private_t *dev_priv = dev->dev_private; |