drm/i915: Prevent out of range pt in gen6_for_each_pde

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_gem_gtt.h

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 0dad42634fd53addefea43714e9ae0690cdbc8f6..3d873467377e289dd16dc8bab89de56af237cb7f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -339,9 +339,9 @@ struct i915_hw_ppgtt {
  * XXX: temp is not actually needed, but it saves doing the ALIGN operation.
  */
 #define gen6_for_each_pde(pt, pd, start, length, temp, iter) \
-       for (iter = gen6_pde_index(start), pt = (pd)->page_table[iter]; \
-            length > 0 && iter < I915_PDES; \
-            pt = (pd)->page_table[++iter], \
+       for (iter = gen6_pde_index(start); \
+            pt = (pd)->page_table[iter], length > 0 && iter < I915_PDES; \
+            iter++, \
             temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT) - start, \
             temp = min_t(unsigned, temp, length), \
             start += temp, length -= temp)