Skip to contentSkip to conversation

drm/tilcdc: Convert drm_atomic_helper_suspend/resume()

PATCH In review Souptick Joarder 2 participants 4 messages Aug 8, 2018 – Sep 10, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/tilcdc: Convert drm_atomic_helper_suspend/resume()

convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().

saved_state in tilcdc_drm_private will not be used anymore, so it can be removed.

---
 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 14 ++++----------
 drivers/gpu/drm/tilcdc/tilcdc_drv.h |  3 ---
 2 files changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +4 -10
index 0fb300d..33e5332 100644
@@ -554,29 +554,23 @@ static int tilcdc_debugfs_init(struct drm_minor *minor)
 static int tilcdc_pm_suspend(struct device *dev)
 {
 	struct drm_device *ddev = dev_get_drvdata(dev);
-	struct tilcdc_drm_private *priv = ddev->dev_private;
+	int ret = 0;
 
-	priv->saved_state = drm_atomic_helper_suspend(ddev);
+	ret = drm_mode_config_helper_suspend(ddev);
 
 	/* Select sleep pin state */
 	pinctrl_pm_select_sleep_state(dev);
 
-	return 0;
+	return ret;
 }
 
 static int tilcdc_pm_resume(struct device *dev)
 {
 	struct drm_device *ddev = dev_get_drvdata(dev);
-	struct tilcdc_drm_private *priv = ddev->dev_private;
-	int ret = 0;
 
 	/* Select default pin state */
 	pinctrl_pm_select_default_state(dev);
-
-	if (priv->saved_state)
-		ret = drm_atomic_helper_resume(ddev, priv->saved_state);
-
-	return ret;
+	return  drm_mode_config_helper_resume(ddev);
 }
 #endif
 
drivers/gpu/drm/tilcdc/tilcdc_drv.h +0 -3
index ead5122..62cea5f 100644
@@ -70,9 +70,6 @@ struct tilcdc_drm_private {
 	const uint32_t *pixelformats;
 	uint32_t num_pixelformats;
 
-	/* The context for pm susped/resume cycle is stored here */
-	struct drm_atomic_state *saved_state;
-
 #ifdef CONFIG_CPU_FREQ
 	struct notifier_block freq_transition;
 #endif
Signature · 1 line
1.9.1
#1 lore raw
Quoted 6 lines · Souptick Joarder

convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().

saved_state in tilcdc_drm_private will not be used anymore, so it can be removed.

Any comment on this patch ?

Quoted 63 lines
---
 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 14 ++++----------
 drivers/gpu/drm/tilcdc/tilcdc_drv.h |  3 ---
 2 files changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +4 -10
index 0fb300d..33e5332 100644
@@ -554,29 +554,23 @@ static int tilcdc_debugfs_init(struct drm_minor *minor)
 static int tilcdc_pm_suspend(struct device *dev)
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
-       struct tilcdc_drm_private *priv = ddev->dev_private;
+       int ret = 0;
 
-       priv->saved_state = drm_atomic_helper_suspend(ddev);
+       ret = drm_mode_config_helper_suspend(ddev);
 
        /* Select sleep pin state */
        pinctrl_pm_select_sleep_state(dev);
 
-       return 0;
+       return ret;
 }
 
 static int tilcdc_pm_resume(struct device *dev)
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
-       struct tilcdc_drm_private *priv = ddev->dev_private;
-       int ret = 0;
 
        /* Select default pin state */
        pinctrl_pm_select_default_state(dev);
-
-       if (priv->saved_state)
-               ret = drm_atomic_helper_resume(ddev, priv->saved_state);
-
-       return ret;
+       return  drm_mode_config_helper_resume(ddev);
 }
 #endif
 
drivers/gpu/drm/tilcdc/tilcdc_drv.h +0 -4
index ead5122..62cea5f 100644
@@ -70,9 +70,6 @@ struct tilcdc_drm_private {
        const uint32_t *pixelformats;
        uint32_t num_pixelformats;
 
-       /* The context for pm susped/resume cycle is stored here */
-       struct drm_atomic_state *saved_state;
-
 #ifdef CONFIG_CPU_FREQ
        struct notifier_block freq_transition;
 #endif
--

1.9.1

Reviewed-by
#2 lore raw
Quoted 9 lines · Souptick Joarder
Quoted 6 lines · Souptick Joarder

convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().

saved_state in tilcdc_drm_private will not be used anymore, so it can be removed.

Any comment on this patch ?

I planned to test this out, but I did not find time to do that. But here is my:

I'll pick this up for my next pull request.

BR,
Jyri

Quoted 63 lines
Quoted 63 lines
---
 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 14 ++++----------
 drivers/gpu/drm/tilcdc/tilcdc_drv.h |  3 ---
 2 files changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +4 -10
index 0fb300d..33e5332 100644
@@ -554,29 +554,23 @@ static int tilcdc_debugfs_init(struct drm_minor *minor)
 static int tilcdc_pm_suspend(struct device *dev)
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
-       struct tilcdc_drm_private *priv = ddev->dev_private;
+       int ret = 0;
 
-       priv->saved_state = drm_atomic_helper_suspend(ddev);
+       ret = drm_mode_config_helper_suspend(ddev);
 
        /* Select sleep pin state */
        pinctrl_pm_select_sleep_state(dev);
 
-       return 0;
+       return ret;
 }
 
 static int tilcdc_pm_resume(struct device *dev)
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
-       struct tilcdc_drm_private *priv = ddev->dev_private;
-       int ret = 0;
 
        /* Select default pin state */
        pinctrl_pm_select_default_state(dev);
-
-       if (priv->saved_state)
-               ret = drm_atomic_helper_resume(ddev, priv->saved_state);
-
-       return ret;
+       return  drm_mode_config_helper_resume(ddev);
 }
 #endif
 
drivers/gpu/drm/tilcdc/tilcdc_drv.h +0 -4
index ead5122..62cea5f 100644
@@ -70,9 +70,6 @@ struct tilcdc_drm_private {
        const uint32_t *pixelformats;
        uint32_t num_pixelformats;
 
-       /* The context for pm susped/resume cycle is stored here */
-       struct drm_atomic_state *saved_state;
-
 #ifdef CONFIG_CPU_FREQ
        struct notifier_block freq_transition;
 #endif
--

1.9.1

Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#3 lore raw
Quoted 10 lines · Jyri Sarha
Quoted 8 lines · Souptick Joarder
Quoted 6 lines · Souptick Joarder

convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().

saved_state in tilcdc_drm_private will not be used anymore, so it can be removed.

Quoted 9 lines
Quoted 1 line

Any comment on this patch ?

I planned to test this out, but I did not find time to do that. But here is my:

I'll pick this up for my next pull request.

Thanks, Hopefully It will make into 4.20 :)

Quoted 71 lines

BR,
Jyri

Quoted 54 lines
Quoted 54 lines
---
 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 14 ++++----------
 drivers/gpu/drm/tilcdc/tilcdc_drv.h |  3 ---
 2 files changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +4 -10
index 0fb300d..33e5332 100644
@@ -554,29 +554,23 @@ static int tilcdc_debugfs_init(struct drm_minor *minor)
 static int tilcdc_pm_suspend(struct device *dev)
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
-       struct tilcdc_drm_private *priv = ddev->dev_private;
+       int ret = 0;
 
-       priv->saved_state = drm_atomic_helper_suspend(ddev);
+       ret = drm_mode_config_helper_suspend(ddev);
 
        /* Select sleep pin state */
        pinctrl_pm_select_sleep_state(dev);
 
-       return 0;
+       return ret;
 }
 
 static int tilcdc_pm_resume(struct device *dev)
 {
        struct drm_device *ddev = dev_get_drvdata(dev);
-       struct tilcdc_drm_private *priv = ddev->dev_private;
-       int ret = 0;
 
        /* Select default pin state */
        pinctrl_pm_select_default_state(dev);
-
-       if (priv->saved_state)
-               ret = drm_atomic_helper_resume(ddev, priv->saved_state);
-
-       return ret;
+       return  drm_mode_config_helper_resume(ddev);
 }
 #endif
 
drivers/gpu/drm/tilcdc/tilcdc_drv.h +0 -0
index ead5122..62cea5f 100644
@@ -70,9 +70,6 @@ struct tilcdc_drm_private {
        const uint32_t *pixelformats;
        uint32_t num_pixelformats;
 
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/tilcdc/tilcdc_drv.h +0 -4
-       /* The context for pm susped/resume cycle is stored here */
-       struct drm_atomic_state *saved_state;
-
 #ifdef CONFIG_CPU_FREQ
        struct notifier_block freq_transition;
 #endif
--

1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki