diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 15:48:38 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 15:48:38 +0100 |
| commit | e0e41598b433c0216814d54c62e7c1834f464d9b (patch) | |
| tree | a4069b104045797da2dc48c62e1acba0132ba98d /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 8daf7473203cd9bd1b9b98200ee1c74dfe4826fe (diff) | |
| parent | d270ae34eb77c58dea60e5b1e300a698d2ce39ac (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 63b38608c80..81513fa5d30 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2533,7 +2533,7 @@ i915_gem_clear_fence_reg(struct drm_gem_object *obj) I915_WRITE64(FENCE_REG_965_0 + (obj_priv->fence_reg * 8), 0); break; case 3: - if (obj_priv->fence_reg > 8) + if (obj_priv->fence_reg >= 8) fence_reg = FENCE_REG_945_8 + (obj_priv->fence_reg - 8) * 4; else case 2: |