diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-09-10 03:40:40 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-09-10 03:40:40 +0000 |
| commit | 621f9420e52ca0fa4e0616c8082063d4648fe43a (patch) | |
| tree | 160b433e8f4e8935b4d74a11052ba2b078302e1a /sys/dev | |
| parent | 0bb891695c3faa1ff503760ad417c6806a968de4 (diff) | |
Enable some code that seems to relate to an errata for
Crystalwell/eDRAM Haswell parts. Original linux commit mesage:
'This magic brings stability to HSW CRW machines.'
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_gem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/i915_gem.c b/sys/dev/pci/drm/i915/i915_gem.c index c2c3432e97e..2cd838fdd05 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.33 2013/08/13 10:23:49 jsg Exp $ */ +/* $OpenBSD: i915_gem.c,v 1.34 2013/09/10 03:40:39 jsg Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -3967,13 +3967,15 @@ i915_gem_init_hw(struct drm_device *dev) #ifdef notyet if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt()) return -EIO; +#endif if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1)) I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000); +#ifdef notyet i915_gem_l3_remap(dev); - #endif + i915_gem_init_swizzling(dev); ret = intel_init_render_ring_buffer(dev); |