OSDN Git Service

drm/hdlcd: Don't call drm_crtc_vblank_off on unbind
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 2 Jun 2020 09:51:40 +0000 (11:51 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Jun 2020 13:46:32 +0000 (15:46 +0200)
This is already taken care of by drm_atomic_helper_shutdown(), and
in that case only for the CRTC which are actually on.

Only tricky bit here is that we kill the interrupt handling before we
shut down crtc, so need to reorder that.

Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200602095140.36678-3-daniel.vetter@ffwll.ch
drivers/gpu/drm/arm/hdlcd_drv.c

index 194419f..26bc5d7 100644 (file)
@@ -347,9 +347,8 @@ static void hdlcd_drm_unbind(struct device *dev)
        of_node_put(hdlcd->crtc.port);
        hdlcd->crtc.port = NULL;
        pm_runtime_get_sync(dev);
-       drm_crtc_vblank_off(&hdlcd->crtc);
-       drm_irq_uninstall(drm);
        drm_atomic_helper_shutdown(drm);
+       drm_irq_uninstall(drm);
        pm_runtime_put(dev);
        if (pm_runtime_enabled(dev))
                pm_runtime_disable(dev);