diff options
| author | Eric Anholt <eric@anholt.net> | 2017-08-02 13:32:40 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-08-08 13:20:10 -0700 |
| commit | 2aee7c5db7c1b828baa93735b70a0ce8a4cdf948 (patch) | |
| tree | 98205c1a197d11826d2e0d8a423f7bb9e983720b /drivers/gpu/drm/vc4/vc4_gem.c | |
| parent | 16fece0153d5b6573c3fcb8cfbe483f83ca8eb01 (diff) | |
| download | linux-stable-2aee7c5db7c1b828baa93735b70a0ce8a4cdf948.tar.gz linux-stable-2aee7c5db7c1b828baa93735b70a0ce8a4cdf948.tar.bz2 linux-stable-2aee7c5db7c1b828baa93735b70a0ce8a4cdf948.zip | |
drm/vc4: Fix double destroy of the BO cache on teardown.
It's also destroyed from the top level vc4_drv.c initialization, which
is where the cache was actually initialized from.
This used to just involve duplicate del_timer() and cancel_work_sync()
being called, but it started causing kmalloc issues once we
double-freed the new BO label array.
Fixes: 1908a876f909 ("drm/vc4: Add an ioctl for labeling GEM BOs for summary stats")
Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20170802203242.12815-1-eric@anholt.net
Tested-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_gem.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_gem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index 209fccd0d3b4..892a031a3ced 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -1117,6 +1117,4 @@ vc4_gem_destroy(struct drm_device *dev) if (vc4->hang_state) vc4_free_hang_state(dev, vc4->hang_state); - - vc4_bo_cache_destroy(dev); } |