diff options
author | Eric Anholt <eric@anholt.net> | 2011-05-06 16:53:49 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-05-13 21:12:50 -0400 |
commit | 10ed13e4a5143000bca816982ea6e68e2a4ac050 (patch) | |
tree | 678eea50f46703e2473e83e932e7865b530e1147 /drivers/gpu/drm/i915 | |
parent | 6067aaeadb5b3df26f27ac827256b1ef01e674f5 (diff) |
drm/i915: Use existing function instead of open-coding fence reg clear.
This is once less place to miss a new INTEL_INFO(dev)->gen update now.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index bf32527fc928..4304f74dfb5f 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -3856,25 +3856,10 @@ i915_gem_load(struct drm_device *dev) | |||
3856 | dev_priv->num_fence_regs = 8; | 3856 | dev_priv->num_fence_regs = 8; |
3857 | 3857 | ||
3858 | /* Initialize fence registers to zero */ | 3858 | /* Initialize fence registers to zero */ |
3859 | switch (INTEL_INFO(dev)->gen) { | 3859 | for (i = 0; i < dev_priv->num_fence_regs; i++) { |
3860 | case 6: | 3860 | i915_gem_clear_fence_reg(dev, &dev_priv->fence_regs[i]); |
3861 | for (i = 0; i < 16; i++) | ||
3862 | I915_WRITE64(FENCE_REG_SANDYBRIDGE_0 + (i * 8), 0); | ||
3863 | break; | ||
3864 | case 5: | ||
3865 | case 4: | ||
3866 | for (i = 0; i < 16; i++) | ||
3867 | I915_WRITE64(FENCE_REG_965_0 + (i * 8), 0); | ||
3868 | break; | ||
3869 | case 3: | ||
3870 | if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev)) | ||
3871 | for (i = 0; i < 8; i++) | ||
3872 | I915_WRITE(FENCE_REG_945_8 + (i * 4), 0); | ||
3873 | case 2: | ||
3874 | for (i = 0; i < 8; i++) | ||
3875 | I915_WRITE(FENCE_REG_830_0 + (i * 4), 0); | ||
3876 | break; | ||
3877 | } | 3861 | } |
3862 | |||
3878 | i915_gem_detect_bit_6_swizzle(dev); | 3863 | i915_gem_detect_bit_6_swizzle(dev); |
3879 | init_waitqueue_head(&dev_priv->pending_flip_queue); | 3864 | init_waitqueue_head(&dev_priv->pending_flip_queue); |
3880 | 3865 | ||