diff options
| author | Daniel Vetter | 2017-01-04 11:41:10 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2017-01-04 11:41:10 +0100 |
| commit | ef426c103892eed94a9bb0ee59c2d0e6eac5179f (patch) | |
| tree | 2d998f23fa6e3b3c51f4829f1f881b42e79b7c04 /drivers/gpu/drm/i915/i915_vma.c | |
| parent | Merge tag 'v4.10-rc2' into drm-intel-next-queued (diff) | |
| parent | drm: Add kerneldoc markup for new @scan parameters in drm_mm (diff) | |
| download | kernel-qcow2-linux-ef426c103892eed94a9bb0ee59c2d0e6eac5179f.tar.gz kernel-qcow2-linux-ef426c103892eed94a9bb0ee59c2d0e6eac5179f.tar.xz kernel-qcow2-linux-ef426c103892eed94a9bb0ee59c2d0e6eac5179f.zip | |
Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc into drm-intel-next-queued
Directly merge drm-misc into drm-intel since Dave is on vacation and
we need the various drm-misc patches (fb format rework, drm mm fixes,
selftest framework and others). Also pulled back -rc2 in first to
resync with drm-intel-fixes and make sure I can reuse the exact rerere
solutions from drm-tip for safety, and because I'm lazy.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index e008e4e8b481..d48c68214611 100644 --- 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; |