]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/hdlcd: remove drm_vblank_cleanup, rise of the zoombies edition
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 28 Jun 2017 09:11:41 +0000 (11:11 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 28 Jun 2017 10:51:13 +0000 (12:51 +0200)
This was accidentally restored in

commit de5cc8155cd250a31da67dea49aff7637ce98887
Author: Liviu Dudau <Liviu.Dudau@arm.com>
Date:   Tue Jun 6 15:05:21 2017 +0100

    drm/arm: hdlcd: Set the CRTC's port before binding the encoder

Fixes: de5cc8155cd2 ("drm/arm: hdlcd: Set the CRTC's port before binding the encoder.")
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170628091141.14539-1-daniel.vetter@ffwll.ch
drivers/gpu/drm/arm/hdlcd_drv.c

index d3da87fbd85a57ff199881fcb12b8afd93434025..90bd97bf00132fd333fca4b7d666099984dc940d 100644 (file)
@@ -343,7 +343,6 @@ static int hdlcd_drm_bind(struct device *dev)
        }
 err_fbdev:
        drm_kms_helper_poll_fini(drm);
-       drm_vblank_cleanup(drm);
 err_vblank:
        pm_runtime_disable(drm->dev);
 err_pm_active:
@@ -375,7 +374,6 @@ static void hdlcd_drm_unbind(struct device *dev)
        component_unbind_all(dev, drm);
        of_node_put(hdlcd->crtc.port);
        hdlcd->crtc.port = NULL;
-       drm_vblank_cleanup(drm);
        pm_runtime_get_sync(drm->dev);
        drm_irq_uninstall(drm);
        pm_runtime_put_sync(drm->dev);