[PATCH 01/10] drm/i915: Extract intel_memory_type_is_local()

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Extract the "is this memory region local?" check into a helper.
I'll have another use for this in the BIOS FB takeover.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_lmem.c   |  3 +--
 drivers/gpu/drm/i915/intel_memory_region.c | 11 +++++++++++
 drivers/gpu/drm/i915/intel_memory_region.h |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c 
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 388f90784d8a..f566191d843b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -48,8 +48,7 @@ bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
            i915_gem_object_evictable(obj))
                assert_object_held(obj);
 #endif
-       return mr && (mr->type == INTEL_MEMORY_LOCAL ||
-                     mr->type == INTEL_MEMORY_STOLEN_LOCAL);
+       return mr && intel_memory_type_is_local(mr->type);
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c 
b/drivers/gpu/drm/i915/intel_memory_region.c
index d40ee1b42110..d2abc0315ba1 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -171,6 +171,17 @@ intel_memory_region_by_type(struct drm_i915_private *i915,
        return NULL;
 }
 
+bool intel_memory_type_is_local(enum intel_memory_type mem_type)
+{
+       switch (mem_type) {
+       case INTEL_MEMORY_LOCAL:
+       case INTEL_MEMORY_STOLEN_LOCAL:
+               return true;
+       default:
+               return false;
+       }
+}
+
 /**
  * intel_memory_region_reserve - Reserve a memory range
  * @mem: The region for which we want to reserve a range.
diff --git a/drivers/gpu/drm/i915/intel_memory_region.h 
b/drivers/gpu/drm/i915/intel_memory_region.h
index 5973b6fe13cf..bfa1697b9566 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -85,6 +85,8 @@ struct intel_memory_region {
        void *region_private;
 };
 
+bool intel_memory_type_is_local(enum intel_memory_type mem_type);
+
 struct intel_memory_region *
 intel_memory_region_lookup(struct drm_i915_private *i915,
                           u16 class, u16 instance);
-- 
2.45.3