[PATCH 1/2] drm/exynos: remove legacy ->suspend()/resume()

[PATCH 1/2] drm/exynos: remove legacy ->suspend()/resume()

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

These legacy helpers should only be used by shadow-attaching drivers.
KMS drivers has its own way to handle suspend/resume and don't need to
use these two helpers.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index f1d6966..9bcf679 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -280,8 +280,6 @@ static struct drm_driver exynos_drm_driver = {
 	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
 	.load			= exynos_drm_load,
 	.unload			= exynos_drm_unload,
-	.suspend		= exynos_drm_suspend,
-	.resume			= exynos_drm_resume,
 	.open			= exynos_drm_open,
 	.preclose		= exynos_drm_preclose,
 	.lastclose		= exynos_drm_lastclose,
-- 
2.1.0

[PATCH 2/2] drm: WARN_ON if a modeset driver uses legacy suspend/resume helpers

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Legacy s/r hooks are only used for shadow-attaching drivers, warn
when a KMS driver tries to use them.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 drivers/gpu/drm/drm_drv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index b7bf4ce..4e76193 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -567,6 +567,8 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
 		ret = drm_minor_alloc(dev, DRM_MINOR_CONTROL);
 		if (ret)
 			goto err_minors;
+
+		WARN_ON(driver->suspend || driver->resume);
 	}
 
 	if (drm_core_check_feature(dev, DRIVER_RENDER)) {
-- 
2.1.0

Re: [PATCH 2/2] drm: WARN_ON if a modeset driver uses legacy suspend/resume helpers

[Daniel Vetter]

On Thu, Aug 13, 2015 at 05:06:39PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> Legacy s/r hooks are only used for shadow-attaching drivers, warn
> when a KMS driver tries to use them.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Assuming that Inki picks up the exynos patch I've applied this to
drm-misc.

Thanks, Daniel

> ---
>  drivers/gpu/drm/drm_drv.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index b7bf4ce..4e76193 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -567,6 +567,8 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
>  		ret = drm_minor_alloc(dev, DRM_MINOR_CONTROL);
>  		if (ret)
>  			goto err_minors;
> +
> +		WARN_ON(driver->suspend || driver->resume);
>  	}
>  
>  	if (drm_core_check_feature(dev, DRIVER_RENDER)) {
> -- 
> 2.1.0
> 

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

Re: [PATCH 1/2] drm/exynos: remove legacy ->suspend()/resume()

[Gustavo Padovan]

Hi,

What about this patch? We need it to avoid the WARN_ON added by patch
2/2 that was already picked up by Daniel.

	Gustavo

2015-08-13 Gustavo Padovan <gustavo@padovan.org>:

> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> These legacy helpers should only be used by shadow-attaching drivers.
> KMS drivers has its own way to handle suspend/resume and don't need to
> use these two helpers.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
>  drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> index f1d6966..9bcf679 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -280,8 +280,6 @@ static struct drm_driver exynos_drm_driver = {
>  	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
>  	.load			= exynos_drm_load,
>  	.unload			= exynos_drm_unload,
> -	.suspend		= exynos_drm_suspend,
> -	.resume			= exynos_drm_resume,
>  	.open			= exynos_drm_open,
>  	.preclose		= exynos_drm_preclose,
>  	.lastclose		= exynos_drm_lastclose,
> -- 
> 2.1.0
> 

Re: [PATCH 1/2] drm/exynos: remove legacy ->suspend()/resume()

[Daniel Vetter]

On Wed, Aug 26, 2015 at 12:50:44PM -0300, Gustavo Padovan wrote:
> Hi,
> 
> What about this patch? We need it to avoid the WARN_ON added by patch
> 2/2 that was already picked up by Daniel.

That patch is only for 4.4, so not too time critical to get the exynos one
in. But might be good to get it into 4.3.
-Daniel

> 
> 	Gustavo
> 
> 2015-08-13 Gustavo Padovan <gustavo@padovan.org>:
> 
> > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > 
> > These legacy helpers should only be used by shadow-attaching drivers.
> > KMS drivers has its own way to handle suspend/resume and don't need to
> > use these two helpers.
> > 
> > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > ---
> >  drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> > index f1d6966..9bcf679 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> > @@ -280,8 +280,6 @@ static struct drm_driver exynos_drm_driver = {
> >  	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
> >  	.load			= exynos_drm_load,
> >  	.unload			= exynos_drm_unload,
> > -	.suspend		= exynos_drm_suspend,
> > -	.resume			= exynos_drm_resume,
> >  	.open			= exynos_drm_open,
> >  	.preclose		= exynos_drm_preclose,
> >  	.lastclose		= exynos_drm_lastclose,
> > -- 
> > 2.1.0
> > 

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