[PATCH] drm/hdlcd: remove drm_vblank_cleanup, rise of the zoombies edition

[PATCH] drm/hdlcd: remove drm_vblank_cleanup, rise of the zoombies edition

[Daniel Vetter]

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: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/arm/hdlcd_drv.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index d3da87fbd85a..90bd97bf0013 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -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);
-- 
2.11.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/hdlcd: remove drm_vblank_cleanup, rise of the zoombies edition

[Liviu Dudau]

On Wed, Jun 28, 2017 at 11:11:41AM +0200, Daniel Vetter wrote:
> 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
> 

Oops, that was not the intent! Thanks for catching this!

Will pull and send a new pull request to Dave, hope I get it on time
before he leaves this week.

Best regards,
Liviu


> Fixes: de5cc8155cd2 ("drm/arm: hdlcd: Set the CRTC's port before binding the encoder.")
> Cc: Liviu Dudau <Liviu.Dudau@arm.com>
> Cc: Liviu Dudau <liviu.dudau@arm.com>
> Cc: Brian Starkey <brian.starkey@arm.com>
> Cc: Mali DP Maintainers <malidp@foss.arm.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drivers/gpu/drm/arm/hdlcd_drv.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
> index d3da87fbd85a..90bd97bf0013 100644
> --- a/drivers/gpu/drm/arm/hdlcd_drv.c
> +++ b/drivers/gpu/drm/arm/hdlcd_drv.c
> @@ -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);
> -- 
> 2.11.0
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/hdlcd: remove drm_vblank_cleanup, rise of the zoombies edition

[Daniel Vetter]

On Wed, Jun 28, 2017 at 10:30:11AM +0100, Liviu Dudau wrote:
> On Wed, Jun 28, 2017 at 11:11:41AM +0200, Daniel Vetter wrote:
> > 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
> > 
> 
> Oops, that was not the intent! Thanks for catching this!
> 
> Will pull and send a new pull request to Dave, hope I get it on time
> before he leaves this week.

As discussed on irc I've pulled this into drm-misc-next so I can apply the
drm_vblank_cleanup.

Thanks, Daniel

> 
> Best regards,
> Liviu
> 
> 
> > Fixes: de5cc8155cd2 ("drm/arm: hdlcd: Set the CRTC's port before binding the encoder.")
> > Cc: Liviu Dudau <Liviu.Dudau@arm.com>
> > Cc: Liviu Dudau <liviu.dudau@arm.com>
> > Cc: Brian Starkey <brian.starkey@arm.com>
> > Cc: Mali DP Maintainers <malidp@foss.arm.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> >  drivers/gpu/drm/arm/hdlcd_drv.c | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
> > index d3da87fbd85a..90bd97bf0013 100644
> > --- a/drivers/gpu/drm/arm/hdlcd_drv.c
> > +++ b/drivers/gpu/drm/arm/hdlcd_drv.c
> > @@ -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);
> > -- 
> > 2.11.0
> > 
> 
> -- 
> ====================
> | I would like to |
> | fix the world,  |
> | but they're not |
> | giving me the   |
>  \ source code!  /
>   ---------------
>     ¯\_(ツ)_/¯

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel