diff options
| author | Grégoire Henry <Gregoire.Henry@pps.jussieu.fr> | 2009-06-23 15:41:02 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-23 09:22:11 -0700 |
| commit | b5aa8a0fc132dd512c33e7c2621d075e3b77a65e (patch) | |
| tree | ce36025b5f62c2eb6bef4e45d18c23a89edfd895 /drivers | |
| parent | 56d21b07d44e0a33ab846f4f08e9e33bd87e5d4b (diff) | |
| download | op-kernel-dev-b5aa8a0fc132dd512c33e7c2621d075e3b77a65e.zip op-kernel-dev-b5aa8a0fc132dd512c33e7c2621d075e3b77a65e.tar.gz | |
drm/i915: initialize fence registers to zero when loading GEM
Unitialized fence register could leads to corrupted display. Problem
encountered on MacBooks (revision 1 and 2), directly booting from EFI
or through BIOS emulation.
(bug #21710 at freedestop.org)
Signed-off-by: Grégoire Henry <henry@pps.jussieu.fr>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 8660b21..876b65c 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4227,6 +4227,7 @@ i915_gem_lastclose(struct drm_device *dev) void i915_gem_load(struct drm_device *dev) { + int i; drm_i915_private_t *dev_priv = dev->dev_private; spin_lock_init(&dev_priv->mm.active_list_lock); @@ -4246,6 +4247,18 @@ i915_gem_load(struct drm_device *dev) else dev_priv->num_fence_regs = 8; + /* Initialize fence registers to zero */ + if (IS_I965G(dev)) { + for (i = 0; i < 16; i++) + I915_WRITE64(FENCE_REG_965_0 + (i * 8), 0); + } else { + for (i = 0; i < 8; i++) + I915_WRITE(FENCE_REG_830_0 + (i * 4), 0); + if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev)) + for (i = 0; i < 8; i++) + I915_WRITE(FENCE_REG_945_8 + (i * 4), 0); + } + i915_gem_detect_bit_6_swizzle(dev); } |
