summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2015-09-30 06:29:10 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2015-09-30 06:29:10 +0000
commit962e91823107ca66a8101a571b049a2b8283c507 (patch)
tree5a95dac41a2e6ac55f901ff2ad1d470349fb1890 /sys/dev/pci/drm
parent7aa9061d07d03e28f129787ccd93e8cba1365f07 (diff)
I missed an #ifdef notyet when enabling the aliasing ppgtt code.
Hopefully this fixes the stability problems people have been seeing on sandybridge and up after the ppgtt code got enabled.
Diffstat (limited to 'sys/dev/pci/drm')
-rw-r--r--sys/dev/pci/drm/i915/i915_gem.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/i915_gem.c b/sys/dev/pci/drm/i915/i915_gem.c
index a2ac0e2d06a..5741015b00f 100644
--- a/sys/dev/pci/drm/i915/i915_gem.c
+++ b/sys/dev/pci/drm/i915/i915_gem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i915_gem.c,v 1.101 2015/09/24 20:52:28 kettenis Exp $ */
+/* $OpenBSD: i915_gem.c,v 1.102 2015/09/30 06:29:09 kettenis Exp $ */
/*
* Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org>
*
@@ -3084,12 +3084,10 @@ int i915_vma_unbind(struct i915_vma *vma)
if (obj->has_global_gtt_mapping)
i915_gem_gtt_unbind_object(obj);
-#ifdef notyet
if (obj->has_aliasing_ppgtt_mapping) {
i915_ppgtt_unbind_object(dev_priv->mm.aliasing_ppgtt, obj);
obj->has_aliasing_ppgtt_mapping = 0;
}
-#endif
i915_gem_gtt_finish_object(obj);
list_del(&vma->mm_list);