From: Eric Anholt <eric@anholt.net>
Date: Wed, 2 Aug 2017 19:48:04 +0000 (-0700)
Subject: drm/vc4: Fix double destroy of the BO cache on teardown.
X-Git-Tag: archive/raspbian/4.9.82-1+deb9u3+rpi1_jessie~5^2~141
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b5695ab6b8a985c6cc5e6d43cd83dc0bc3ef81c8;p=linux-4.9.git

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>
---

diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index a5029ab49068..066e7009358c 100644
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -964,6 +964,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);
 }