summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorChris Wilson2010-09-24 00:04:43 +0200
committerChris Wilson2010-09-24 15:19:57 +0200
commite6c3a2a6d358a726c2c52cb0132c9ad8f6f37486 (patch)
treec326448ac6aa0abe53d7cb5a9706894572fd19ca /drivers/gpu/drm/i915/i915_gem.c
parentdrm/i915: Remove unused dev_priv->panel_wants_dither (diff)
downloadkernel-qcow2-linux-e6c3a2a6d358a726c2c52cb0132c9ad8f6f37486.tar.gz
kernel-qcow2-linux-e6c3a2a6d358a726c2c52cb0132c9ad8f6f37486.tar.xz
kernel-qcow2-linux-e6c3a2a6d358a726c2c52cb0132c9ad8f6f37486.zip
drm/i915: Use an uninterruptible wait for page-flips during modeset
We need to drain the pending flips prior to disabling the pipe during modeset, and these need to be done in an uninterruptible fashion. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 174e38abc9ef..dec7bbc81cb6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3506,7 +3506,7 @@ i915_gem_check_execbuffer (struct drm_i915_gem_execbuffer2 *exec,
return 0;
}
-int
+static int
i915_gem_wait_for_pending_flip(struct drm_device *dev,
struct drm_gem_object **object_list,
int count)