Commit e9ceb751 authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson

drm/i915: s/i915_gtt_color_adjust/i915_ggtt_color_adjust

Make it clear that the color adjust callback applies to the ggtt.
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190909124052.22900-2-matthew.auld@intel.com
parent 1e0a96e5
...@@ -2547,10 +2547,10 @@ static int ggtt_set_pages(struct i915_vma *vma) ...@@ -2547,10 +2547,10 @@ static int ggtt_set_pages(struct i915_vma *vma)
return 0; return 0;
} }
static void i915_gtt_color_adjust(const struct drm_mm_node *node, static void i915_ggtt_color_adjust(const struct drm_mm_node *node,
unsigned long color, unsigned long color,
u64 *start, u64 *start,
u64 *end) u64 *end)
{ {
if (i915_node_color_differs(node, color)) if (i915_node_color_differs(node, color))
*start += I915_GTT_PAGE_SIZE; *start += I915_GTT_PAGE_SIZE;
...@@ -3206,7 +3206,7 @@ static int ggtt_init_hw(struct i915_ggtt *ggtt) ...@@ -3206,7 +3206,7 @@ static int ggtt_init_hw(struct i915_ggtt *ggtt)
ggtt->vm.has_read_only = IS_VALLEYVIEW(i915); ggtt->vm.has_read_only = IS_VALLEYVIEW(i915);
if (!HAS_LLC(i915) && !HAS_PPGTT(i915)) if (!HAS_LLC(i915) && !HAS_PPGTT(i915))
ggtt->vm.mm.color_adjust = i915_gtt_color_adjust; ggtt->vm.mm.color_adjust = i915_ggtt_color_adjust;
if (!io_mapping_init_wc(&ggtt->iomap, if (!io_mapping_init_wc(&ggtt->iomap,
ggtt->gmadr.start, ggtt->gmadr.start,
......
...@@ -276,7 +276,7 @@ static int igt_evict_for_cache_color(void *arg) ...@@ -276,7 +276,7 @@ static int igt_evict_for_cache_color(void *arg)
/* Currently the use of color_adjust is limited to cache domains within /* Currently the use of color_adjust is limited to cache domains within
* the ggtt, and so the presence of mm.color_adjust is assumed to be * the ggtt, and so the presence of mm.color_adjust is assumed to be
* i915_gtt_color_adjust throughout our driver, so using a mock color * i915_ggtt_color_adjust throughout our driver, so using a mock color
* adjust will work just fine for our purposes. * adjust will work just fine for our purposes.
*/ */
ggtt->vm.mm.color_adjust = mock_color_adjust; ggtt->vm.mm.color_adjust = mock_color_adjust;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment