drm/hibmc: Drop drm_vblank_cleanup

So this seems to be the first driver that does it the right way round,
so fix it up by calling drm_atomic_helper_shutdown instead. We need to
do that before the last kms user is gone (fbdev emulation), but before
we start shutting down hw stuff like interrupts.

Cc: Xinliang Liu <[email protected]>
Cc: Rongrong Zou <[email protected]>
Cc: Xinwei Kong <[email protected]>
Cc: Chen Feng <[email protected]>
Reviewed-by: Sean Paul <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index 2ffdbf9801bd644c3d1320b2499012c8ba6c83f0..4d018ca98581c5f3156fb9fdffc873ca7ab030f4 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -276,11 +276,12 @@ static int hibmc_unload(struct drm_device *dev)
 
        hibmc_fbdev_fini(priv);
 
+       drm_atomic_helper_shutdown(dev);
+
        if (dev->irq_enabled)
                drm_irq_uninstall(dev);
        if (priv->msi_enabled)
                pci_disable_msi(dev->pdev);
-       drm_vblank_cleanup(dev);
 
        hibmc_kms_fini(priv);
        hibmc_mm_fini(priv);