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

drm/i915: remove the other slab_dependencies

The real one can be found in i915_scheduler.c.
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
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/20200220105707.344522-1-matthew.auld@intel.com
parent e24bcd34
...@@ -51,7 +51,6 @@ struct execute_cb { ...@@ -51,7 +51,6 @@ struct execute_cb {
static struct i915_global_request { static struct i915_global_request {
struct i915_global base; struct i915_global base;
struct kmem_cache *slab_requests; struct kmem_cache *slab_requests;
struct kmem_cache *slab_dependencies;
struct kmem_cache *slab_execute_cbs; struct kmem_cache *slab_execute_cbs;
} global; } global;
...@@ -1614,14 +1613,12 @@ long i915_request_wait(struct i915_request *rq, ...@@ -1614,14 +1613,12 @@ long i915_request_wait(struct i915_request *rq,
static void i915_global_request_shrink(void) 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_execute_cbs);
kmem_cache_shrink(global.slab_requests); kmem_cache_shrink(global.slab_requests);
} }
static void i915_global_request_exit(void) 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_execute_cbs);
kmem_cache_destroy(global.slab_requests); kmem_cache_destroy(global.slab_requests);
} }
...@@ -1651,17 +1648,9 @@ int __init i915_global_request_init(void) ...@@ -1651,17 +1648,9 @@ int __init i915_global_request_init(void)
if (!global.slab_execute_cbs) if (!global.slab_execute_cbs)
goto err_requests; 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); i915_global_register(&global.base);
return 0; return 0;
err_execute_cbs:
kmem_cache_destroy(global.slab_execute_cbs);
err_requests: err_requests:
kmem_cache_destroy(global.slab_requests); kmem_cache_destroy(global.slab_requests);
return -ENOMEM; return -ENOMEM;
......
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