diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
| commit | 970259bff472579204108c6f27036ec4d1206ae1 (patch) | |
| tree | 869bdcda9aac4c67712d93e6141056fdf3f41bd8 /drivers/gpu/drm/amd/scheduler/sched_fence.c | |
| parent | 9b1b61cd8e31d9beba871333d7a798b3adb89288 (diff) | |
| parent | 29f5b34ca1a191c2cf4f6c8c12f4dec56e8d3bc1 (diff) | |
| download | linux-970259bff472579204108c6f27036ec4d1206ae1.tar.bz2 | |
Merge branch '81xx' into omap-for-v4.4/fixes
Diffstat (limited to 'drivers/gpu/drm/amd/scheduler/sched_fence.c')
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/sched_fence.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/sched_fence.c b/drivers/gpu/drm/amd/scheduler/sched_fence.c index d802638094f4..8d2130b9ff05 100644 --- a/drivers/gpu/drm/amd/scheduler/sched_fence.c +++ b/drivers/gpu/drm/amd/scheduler/sched_fence.c @@ -32,7 +32,7 @@ struct amd_sched_fence *amd_sched_fence_create(struct amd_sched_entity *s_entity struct amd_sched_fence *fence = NULL; unsigned seq; - fence = kzalloc(sizeof(struct amd_sched_fence), GFP_KERNEL); + fence = kmem_cache_zalloc(sched_fence_slab, GFP_KERNEL); if (fence == NULL) return NULL; fence->owner = owner; @@ -71,11 +71,17 @@ static bool amd_sched_fence_enable_signaling(struct fence *f) return true; } +static void amd_sched_fence_release(struct fence *f) +{ + struct amd_sched_fence *fence = to_amd_sched_fence(f); + kmem_cache_free(sched_fence_slab, fence); +} + const struct fence_ops amd_sched_fence_ops = { .get_driver_name = amd_sched_fence_get_driver_name, .get_timeline_name = amd_sched_fence_get_timeline_name, .enable_signaling = amd_sched_fence_enable_signaling, .signaled = NULL, .wait = fence_default_wait, - .release = NULL, + .release = amd_sched_fence_release, }; |