We are adding two new callbacks to ttm resource manager
function to handle intersection and compatibility of
placement and resources.

v2: move the amdgpu and ttm_range_manager changes to
    separate patches (Christian)
v3: rename "intersect" to "intersects" (Matthew)
v4: move !place check to the !res if and return false
    in ttm_resource_compatible() function (Christian)

Signed-off-by: Christian König <christian.koe...@amd.com>
Signed-off-by: Arunpravin Paneer Selvam <arunpravin.paneersel...@amd.com>
---
 drivers/gpu/drm/ttm/ttm_resource.c | 59 ++++++++++++++++++++++++++++++
 include/drm/ttm/ttm_resource.h     | 40 ++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/drivers/gpu/drm/ttm/ttm_resource.c 
b/drivers/gpu/drm/ttm/ttm_resource.c
index 20f9adcc3235..ea67976f1f60 100644
--- a/drivers/gpu/drm/ttm/ttm_resource.c
+++ b/drivers/gpu/drm/ttm/ttm_resource.c
@@ -253,6 +253,65 @@ void ttm_resource_free(struct ttm_buffer_object *bo, 
struct ttm_resource **res)
 }
 EXPORT_SYMBOL(ttm_resource_free);
 
+/**
+ * ttm_resource_intersects - test for intersection
+ *
+ * @bdev: TTM device structure
+ * @res: The resource to test
+ * @place: The placement to test
+ * @size: How many bytes the new allocation needs.
+ *
+ * Test if @res intersects with @place and @size. Used for testing if evictions
+ * are valueable or not.
+ *
+ * Returns true if the res placement intersects with @place and @size.
+ */
+bool ttm_resource_intersects(struct ttm_device *bdev,
+                            struct ttm_resource *res,
+                            const struct ttm_place *place,
+                            size_t size)
+{
+       struct ttm_resource_manager *man;
+
+       if (!res)
+               return false;
+
+       man = ttm_manager_type(bdev, res->mem_type);
+       if (!place || !man->func->intersects)
+               return true;
+
+       return man->func->intersects(man, res, place, size);
+}
+
+/**
+ * ttm_resource_compatible - test for compatibility
+ *
+ * @bdev: TTM device structure
+ * @res: The resource to test
+ * @place: The placement to test
+ * @size: How many bytes the new allocation needs.
+ *
+ * Test if @res compatible with @place and @size.
+ *
+ * Returns true if the res placement compatible with @place and @size.
+ */
+bool ttm_resource_compatible(struct ttm_device *bdev,
+                            struct ttm_resource *res,
+                            const struct ttm_place *place,
+                            size_t size)
+{
+       struct ttm_resource_manager *man;
+
+       if (!res || !place)
+               return false;
+
+       man = ttm_manager_type(bdev, res->mem_type);
+       if (!man->func->compatible)
+               return true;
+
+       return man->func->compatible(man, res, place, size);
+}
+
 static bool ttm_resource_places_compat(struct ttm_resource *res,
                                       const struct ttm_place *places,
                                       unsigned num_placement)
diff --git a/include/drm/ttm/ttm_resource.h b/include/drm/ttm/ttm_resource.h
index ca89a48c2460..5afc6d664fde 100644
--- a/include/drm/ttm/ttm_resource.h
+++ b/include/drm/ttm/ttm_resource.h
@@ -88,6 +88,38 @@ struct ttm_resource_manager_func {
        void (*free)(struct ttm_resource_manager *man,
                     struct ttm_resource *res);
 
+       /**
+        * struct ttm_resource_manager_func member intersects
+        *
+        * @man: Pointer to a memory type manager.
+        * @res: Pointer to a struct ttm_resource to be checked.
+        * @place: Placement to check against.
+        * @size: Size of the check.
+        *
+        * Test if @res intersects with @place + @size. Used to judge if
+        * evictions are valueable or not.
+        */
+       bool (*intersects)(struct ttm_resource_manager *man,
+                          struct ttm_resource *res,
+                          const struct ttm_place *place,
+                          size_t size);
+
+       /**
+        * struct ttm_resource_manager_func member compatible
+        *
+        * @man: Pointer to a memory type manager.
+        * @res: Pointer to a struct ttm_resource to be checked.
+        * @place: Placement to check against.
+        * @size: Size of the check.
+        *
+        * Test if @res compatible with @place + @size. Used to check of
+        * the need to move the backing store or not.
+        */
+       bool (*compatible)(struct ttm_resource_manager *man,
+                          struct ttm_resource *res,
+                          const struct ttm_place *place,
+                          size_t size);
+
        /**
         * struct ttm_resource_manager_func member debug
         *
@@ -329,6 +361,14 @@ int ttm_resource_alloc(struct ttm_buffer_object *bo,
                       const struct ttm_place *place,
                       struct ttm_resource **res);
 void ttm_resource_free(struct ttm_buffer_object *bo, struct ttm_resource 
**res);
+bool ttm_resource_intersects(struct ttm_device *bdev,
+                            struct ttm_resource *res,
+                            const struct ttm_place *place,
+                            size_t size);
+bool ttm_resource_compatible(struct ttm_device *bdev,
+                            struct ttm_resource *res,
+                            const struct ttm_place *place,
+                            size_t size);
 bool ttm_resource_compat(struct ttm_resource *res,
                         struct ttm_placement *placement);
 void ttm_resource_set_bo(struct ttm_resource *res,

base-commit: 5727dcfd8486399c40e39d2c08fe36fedab29d99
-- 
2.25.1

Reply via email to