]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: remove the other slab_dependencies
authorMatthew Auld <matthew.auld@intel.com>
Thu, 20 Feb 2020 10:57:07 +0000 (10:57 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 20 Feb 2020 12:11:31 +0000 (12:11 +0000)
The real one can be found in i915_scheduler.c.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220105707.344522-1-matthew.auld@intel.com
drivers/gpu/drm/i915/i915_request.c

index 6daf18dbb3d4d14d8c31bde742c73c868da5a598..d53af93b919b22f7b6db59080d0e1b210209bedd 100644 (file)
@@ -51,7 +51,6 @@ struct execute_cb {
 static struct i915_global_request {
        struct i915_global base;
        struct kmem_cache *slab_requests;
-       struct kmem_cache *slab_dependencies;
        struct kmem_cache *slab_execute_cbs;
 } global;
 
@@ -1614,14 +1613,12 @@ out:
 
 static void i915_global_request_shrink(void)
 {
-       kmem_cache_shrink(global.slab_dependencies);
        kmem_cache_shrink(global.slab_execute_cbs);
        kmem_cache_shrink(global.slab_requests);
 }
 
 static void i915_global_request_exit(void)
 {
-       kmem_cache_destroy(global.slab_dependencies);
        kmem_cache_destroy(global.slab_execute_cbs);
        kmem_cache_destroy(global.slab_requests);
 }
@@ -1651,17 +1648,9 @@ int __init i915_global_request_init(void)
        if (!global.slab_execute_cbs)
                goto err_requests;
 
-       global.slab_dependencies = KMEM_CACHE(i915_dependency,
-                                             SLAB_HWCACHE_ALIGN |
-                                             SLAB_RECLAIM_ACCOUNT);
-       if (!global.slab_dependencies)
-               goto err_execute_cbs;
-
        i915_global_register(&global.base);
        return 0;
 
-err_execute_cbs:
-       kmem_cache_destroy(global.slab_execute_cbs);
 err_requests:
        kmem_cache_destroy(global.slab_requests);
        return -ENOMEM;