diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-10-29 20:01:01 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-11-02 12:14:43 +0100 |
| commit | 171a072b4699b4bf79cd1bbbcd05a53d40903034 (patch) | |
| tree | a3599950ff7be0c012f8aefd770012becf76cd1a /drivers/gpu/drm/vc4/vc4_drv.c | |
| parent | e46e5330d13de67de5b614c5021730e9709de975 (diff) | |
drm/vc4: gem: Add a managed action to cleanup the job queue
The job queue needs to be cleaned up using vc4_gem_destroy, but it's
not used consistently (vc4_drv's bind calls it in its error path, but
doesn't in unbind), and we can make that automatic through a managed
action. Let's remove the requirement to call vc4_gem_destroy.
Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.")
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201029190104.2181730-3-maxime@cerno.tech
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_drv.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 44209077000d..2e418fa5b81c 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -285,11 +285,13 @@ static int vc4_drm_bind(struct device *dev) if (ret) goto dev_put; - vc4_gem_init(drm); + ret = vc4_gem_init(drm); + if (ret) + goto dev_put; ret = component_bind_all(dev, drm); if (ret) - goto gem_destroy; + goto dev_put; ret = vc4_plane_create_additional_planes(drm); if (ret) @@ -314,8 +316,6 @@ static int vc4_drm_bind(struct device *dev) unbind_all: component_unbind_all(dev, drm); -gem_destroy: - vc4_gem_destroy(drm); dev_put: drm_dev_put(drm); return ret; |