drm: Wrap direct calls to driver->gem_free_object from CMA
authorChris Wilson <[email protected]>
Tue, 31 May 2016 21:25:52 +0000 (22:25 +0100)
committerDave Airlie <[email protected]>
Wed, 1 Jun 2016 05:00:28 +0000 (15:00 +1000)
commitafe705be38f1e65b173868486944377186b9f206
tree220cc9f31a837921f8c5fa92c6703c33fa210d9a
parent1e8985a835fdffc99f823c25ace54833656c505a
drm: Wrap direct calls to driver->gem_free_object from CMA

Since the introduction of (struct_mutex) lockless GEM bo freeing, there
are a pair of driver vfuncs for freeing the GEM bo, of which the driver
may choose to only implement driver->gem_object_free_unlocked (and so
avoid taking the struct_mutex along the free path). However, the CMA GEM
helpers were still calling driver->gem_free_object directly, now NULL,
and promptly dying on the fancy new lockless drivers. Oops.

Robert Foss bisected this to b82caafcf2303 (drm/vc4: Use lockless gem BO
free callback) on his vc4 device, but that just serves as an enabler for
9f0ba539d13ae (drm/gem: support BO freeing without dev->struct_mutex).

Reported-by: Robert Foss <[email protected]>
Fixes: 9f0ba539d13ae (drm/gem: support BO freeing without dev->struct_mutex)
Signed-off-by: Chris Wilson <[email protected]>
Cc: Robert Foss <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: [email protected]
Reviewed-by: Daniel Vetter <[email protected]>
Tested-by: Robert Foss <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
drivers/gpu/drm/drm_fb_cma_helper.c
drivers/gpu/drm/drm_gem_cma_helper.c