Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_vma.c

diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index e008e4e8b4817d0749e58952dc83710f21c6c8bc..d48c6821461108ede95400692bb22cbac1b900ab 100644 (file)
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -332,11 +332,11 @@ bool i915_gem_valid_gtt_space(struct i915_vma *vma, unsigned long cache_level)
        GEM_BUG_ON(list_empty(&node->node_list));
 
        other = list_prev_entry(node, node_list);
-       if (color_differs(other, cache_level) && !other->hole_follows)
+       if (color_differs(other, cache_level) && !drm_mm_hole_follows(other))
                return false;
 
        other = list_next_entry(node, node_list);
-       if (color_differs(other, cache_level) && !node->hole_follows)
+       if (color_differs(other, cache_level) && !drm_mm_hole_follows(node))
                return false;
 
        return true;