diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-03-30 01:03:06 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-03-30 01:03:06 +0000 |
| commit | 43adf2fd3645f8f4063a21b23c70f9436e8a2c1e (patch) | |
| tree | c92ebd7f502aeecfa735f23db888a2f8339f4d39 /sys/dev/pci/drm/i915 | |
| parent | 1de56eece1a4853bc929ac20737d5f1cb3c0b20f (diff) | |
drm/i915: Prevent MI_DISPLAY_FLIP straddling two cachelines on IVB
From Ville Syrjala
0828f7607cee51cabf00b984dad3a8ef200beb41 in ubuntu 3.8
f66fab8e1cd6b3127ba4c5c0d11539fbe1de1e36 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/i915')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_display.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c index c30ab0d2627..bc528bd3abc 100644 --- a/sys/dev/pci/drm/i915/intel_display.c +++ b/sys/dev/pci/drm/i915/intel_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_display.c,v 1.32 2014/03/16 03:34:32 jsg Exp $ */ +/* $OpenBSD: intel_display.c,v 1.33 2014/03/30 01:03:05 jsg Exp $ */ /* * Copyright © 2006-2007 Intel Corporation * @@ -7503,6 +7503,20 @@ static int intel_gen7_queue_flip(struct drm_device *dev, goto err_unpin; } + /* + * BSpec MI_DISPLAY_FLIP for IVB: + * "The full packet must be contained within the same cache line." + * + * Currently the LRI+SRM+MI_DISPLAY_FLIP all fit within the same + * cacheline, if we ever start emitting more commands before + * the MI_DISPLAY_FLIP we may need to first emit everything else, + * then do the cacheline alignment, and finally emit the + * MI_DISPLAY_FLIP. + */ + ret = intel_ring_cacheline_align(ring); + if (ret) + goto err_unpin; + ret = intel_ring_begin(ring, 4); if (ret) goto err_unpin; |