diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 16:21:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 16:21:08 +0900 |
| commit | 540565257101f7c52b6fc5a57651f7505f8d20fe (patch) | |
| tree | 7adee0bc65a02fead0dd9cae4f2d4632b227ac56 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 4d048435e9864998f6a6ad16422393d42322716d (diff) | |
| parent | 421b446abeec55bed1251fab80cb5c12be58b773 (diff) | |
| download | linux-540565257101f7c52b6fc5a57651f7505f8d20fe.tar.bz2 | |
Merge branch 'rmobile/fsi-despair' into rmobile-fixes-for-linus
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 48d8fd686ea9..bee24b1a58e8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1611,6 +1611,18 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, wait_event(dev_priv->pending_flip_queue, atomic_read(&obj_priv->pending_flip) == 0); + + /* Big Hammer, we also need to ensure that any pending + * MI_WAIT_FOR_EVENT inside a user batch buffer on the + * current scanout is retired before unpinning the old + * framebuffer. + */ + ret = i915_gem_object_flush_gpu(obj_priv, false); + if (ret) { + i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj); + mutex_unlock(&dev->struct_mutex); + return ret; + } } ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y, |