]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/imx: Drop drm_vblank_cleanup
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 24 May 2017 14:51:58 +0000 (16:51 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 31 May 2017 08:49:32 +0000 (10:49 +0200)
It's only done in the driver load error path, where vblanks don't need
to be quiescent anyway. And that's all drm_vblank_cleanup does, since
the core will release the vblank allocations on its own already. So
drop it.

Cc: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-24-daniel.vetter@ffwll.ch
drivers/gpu/drm/imx/imx-drm-core.c

index 50add2f9e250b671c0727044246634b587eeb56d..95e2181963d9aa097fef3c0063a6fc94cb024bcf 100644 (file)
@@ -278,7 +278,7 @@ static int imx_drm_bind(struct device *dev)
        /* Now try and bind all our sub-components */
        ret = component_bind_all(dev, drm);
        if (ret)
-               goto err_vblank;
+               goto err_kms;
 
        drm_mode_config_reset(drm);
 
@@ -316,8 +316,6 @@ err_fbhelper:
 err_unbind:
 #endif
        component_unbind_all(drm->dev, drm);
-err_vblank:
-       drm_vblank_cleanup(drm);
 err_kms:
        drm_mode_config_cleanup(drm);
 err_unref: