UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Use a separate slab for vmas 

vma are more frequently allocated than objects and so should equally
benefit from having a dedicated slab.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2015-04-07 16:20:58 +01:00 committed by Daniel Vetter
parent efab6d8dd1
commit e20d2ab741
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_dma.c
View File

@ -1008,6 +1008,8 @@ put_bridge:
free_priv: free_priv:
if (dev_priv->requests) if (dev_priv->requests)
kmem_cache_destroy(dev_priv->requests); kmem_cache_destroy(dev_priv->requests);
if (dev_priv->vmas)
kmem_cache_destroy(dev_priv->vmas);
if (dev_priv->objects) if (dev_priv->objects)
kmem_cache_destroy(dev_priv->objects); kmem_cache_destroy(dev_priv->objects);
kfree(dev_priv); kfree(dev_priv);
@ -1094,6 +1096,8 @@ int i915_driver_unload(struct drm_device *dev)
if (dev_priv->requests) if (dev_priv->requests)
kmem_cache_destroy(dev_priv->requests); kmem_cache_destroy(dev_priv->requests);
if (dev_priv->vmas)
kmem_cache_destroy(dev_priv->vmas);
if (dev_priv->objects) if (dev_priv->objects)
kmem_cache_destroy(dev_priv->objects); kmem_cache_destroy(dev_priv->objects);

1
drivers/gpu/drm/i915/i915_drv.h
View File

@ -1559,6 +1559,7 @@ struct i915_virtual_gpu {
struct drm_i915_private { struct drm_i915_private {
struct drm_device *dev; struct drm_device *dev;
struct kmem_cache *objects; struct kmem_cache *objects;
struct kmem_cache *vmas;
struct kmem_cache *requests; struct kmem_cache *requests;
const struct intel_device_info info; const struct intel_device_info info;

7
drivers/gpu/drm/i915/i915_gem.c
View File

@ -4612,7 +4612,7 @@ void i915_gem_vma_destroy(struct i915_vma *vma)
list_del(&vma->vma_link); list_del(&vma->vma_link);
kfree(vma); kmem_cache_free(to_i915(vma->obj->base.dev)->vmas, vma);
} }
static void static void
@ -4991,6 +4991,11 @@ i915_gem_load(struct drm_device *dev)
sizeof(struct drm_i915_gem_object), 0, sizeof(struct drm_i915_gem_object), 0,
SLAB_HWCACHE_ALIGN, SLAB_HWCACHE_ALIGN,
NULL); NULL);
dev_priv->vmas =
kmem_cache_create("i915_gem_vma",
sizeof(struct i915_vma), 0,
SLAB_HWCACHE_ALIGN,
NULL);
dev_priv->requests = dev_priv->requests =
kmem_cache_create("i915_gem_request", kmem_cache_create("i915_gem_request",
sizeof(struct drm_i915_gem_request), 0, sizeof(struct drm_i915_gem_request), 0,

3
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@ -2712,7 +2712,8 @@ __i915_gem_vma_create(struct drm_i915_gem_object *obj,
if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view)) if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
vma = kzalloc(sizeof(*vma), GFP_KERNEL);
vma = kmem_cache_zalloc(to_i915(obj->base.dev)->vmas, GFP_KERNEL);
if (vma == NULL) if (vma == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);