Commit 1e0a96e5 authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

drm/i915: export color_differs 

Timeout while sanitizing links - rendering aborted. Please reduce the number of links if possible.
parent d810583f

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -2552,7 +2552,7 @@ static void i915_gtt_color_adjust(const struct drm_mm_node *node, 
				  u64 *start,

				  u64 *end)

{

	if (node->allocated && node->color != color)

	if (i915_node_color_differs(node, color))

		*start += I915_GTT_PAGE_SIZE;



	/* Also leave a space between the unallocated reserved node after the

drivers/gpu/drm/i915/i915_vma.c

+4 −7
Original line number Diff line number Diff line
@@ -477,11 +477,6 @@ void __i915_vma_set_map_and_fenceable(struct i915_vma *vma) 
		vma->flags &= ~I915_VMA_CAN_FENCE;

}



static bool color_differs(struct drm_mm_node *node, unsigned long color)

{

	return node->allocated && node->color != color;

}



bool i915_gem_valid_gtt_space(struct i915_vma *vma, unsigned long cache_level)

{

	struct drm_mm_node *node = &vma->node;
@@ -502,11 +497,13 @@ 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) && !drm_mm_hole_follows(other))

	if (i915_node_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) && !drm_mm_hole_follows(node))

	if (i915_node_color_differs(other, cache_level) &&

	    !drm_mm_hole_follows(node))

		return false;



	return true;

drivers/gpu/drm/i915/i915_vma.h

+6 −0
Original line number Diff line number Diff line
@@ -373,6 +373,12 @@ static inline bool i915_vma_is_bound(const struct i915_vma *vma, 
	return vma->flags & where;

}



static inline bool i915_node_color_differs(const struct drm_mm_node *node,

					   unsigned long color)

{

	return node->allocated && node->color != color;

}



/**

 * i915_vma_pin_iomap - calls ioremap_wc to map the GGTT VMA via the aperture

 * @vma: VMA to iomap