diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-06 14:36:27 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-06 14:37:27 +0000 |
| commit | 0be732841fb925b6f1242211ea211c022b6ac26c (patch) | |
| tree | 428bea230eaaa2140f49275751cdd2f2667270c8 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 0ac74c6b3386f0413baf48f6d61850650e0dc4ab (diff) | |
| download | kernel_samsung_smdk4412-0be732841fb925b6f1242211ea211c022b6ac26c.zip kernel_samsung_smdk4412-0be732841fb925b6f1242211ea211c022b6ac26c.tar.gz kernel_samsung_smdk4412-0be732841fb925b6f1242211ea211c022b6ac26c.tar.bz2 | |
drm/i915: Wait for the bo if a display flip is pipelined on the other ring
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.c | 2 |
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 e773333..b57ce03 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2926,7 +2926,7 @@ i915_gem_object_set_to_display_plane(struct drm_i915_gem_object *obj, i915_gem_object_flush_gpu_write_domain(obj); /* Currently, we are always called from an non-interruptible context. */ - if (!pipelined) { + if (pipelined != obj->ring) { ret = i915_gem_object_wait_rendering(obj, false); if (ret) return ret; |