| Message ID | 20170802203242.12815-1-eric@anholt.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Den 02.08.2017 22.32, skrev Eric Anholt: > 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> > --- > drivers/gpu/drm/vc4/vc4_gem.c | 2 -- > 1 file changed, 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); > } I don't have a display connected, but there's no crashing anymore. Tested-by: Noralf Trønnes <noralf@tronnes.org> Acked-by: Noralf Trønnes <noralf@tronnes.org>
On Wed, 2 Aug 2017 13:32:40 -0700 Eric Anholt <eric@anholt.net> wrote: > 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> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > drivers/gpu/drm/vc4/vc4_gem.c | 2 -- > 1 file changed, 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); > }
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); }
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> --- drivers/gpu/drm/vc4/vc4_gem.c | 2 -- 1 file changed, 2 deletions(-)