OSDN Git Service

drm/malidp: Don't call drm_crtc_vblank_off on unbind
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 2 Jun 2020 09:55:05 +0000 (11:55 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Jun 2020 13:46:12 +0000 (15:46 +0200)
This is already done as part of the drm_atomic_helper_shutdown(),
and in that case only for the crtc which are actually on.

v2: I overlooked that malidp also needs to have it's interrupt shut
down reordered.

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/20200602095505.37509-1-daniel.vetter@ffwll.ch
drivers/gpu/drm/arm/malidp_drv.c

index c2507b7..f21599c 100644 (file)
@@ -929,11 +929,10 @@ static void malidp_unbind(struct device *dev)
        drm_dev_unregister(drm);
        drm_kms_helper_poll_fini(drm);
        pm_runtime_get_sync(dev);
-       drm_crtc_vblank_off(&malidp->crtc);
+       drm_atomic_helper_shutdown(drm);
        malidp_se_irq_fini(hwdev);
        malidp_de_irq_fini(hwdev);
        drm->irq_enabled = false;
-       drm_atomic_helper_shutdown(drm);
        component_unbind_all(dev, drm);
        of_node_put(malidp->crtc.port);
        malidp->crtc.port = NULL;