From 0cfee2d7fd992d51cd68cc333dfebadc923abd92 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 18 Jan 2023 15:15:37 +0200 Subject: [PATCH] drm/i915: move I915_COLOR_UNEVICTABLE to i915_gem_gtt.h Declutter i915_drv.h. Signed-off-by: Jani Nikula Acked-by: Tvrtko Ursulin Acked-by: Nirmoy Das Link: https://patchwork.freedesktop.org/patch/msgid/20230118131538.3558599-6-jani.nikula@intel.com --- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 00fa754..a2dcd08 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -67,8 +67,6 @@ struct drm_i915_clock_gating_funcs; struct vlv_s0ix_state; -#define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */ - #define GEM_QUIRK_PIN_SWIZZLED_PAGES BIT(0) /* Data Stolen Memory (DSM) aka "i915 stolen memory" */ diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index 8c2f57e..4c299800 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h @@ -18,6 +18,8 @@ struct drm_i915_gem_object; struct i915_address_space; struct i915_gem_ww_ctx; +#define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */ + int __must_check i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj, struct sg_table *pages); void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj, -- 2.7.4