Skip to contentSkip to conversation

drm/imx: Convert drm_atomic_helper_suspend/resume()

PATCH In review Souptick Joarder 2 participants 3 messages Jul 28, 2018 – Jul 31, 2018

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

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

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

---
 drivers/gpu/drm/imx/imx-drm-core.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +2 -24
index 1d053bb..cdd83ea 100644
@@ -355,37 +355,15 @@ static int imx_drm_platform_remove(struct platform_device *pdev)
 static int imx_drm_suspend(struct device *dev)
 {
 	struct drm_device *drm_dev = dev_get_drvdata(dev);
-	struct imx_drm_device *imxdrm;
-
-	/* The drm_dev is NULL before .load hook is called */
-	if (drm_dev == NULL)
-		return 0;
-
-	drm_kms_helper_poll_disable(drm_dev);
-
-	imxdrm = drm_dev->dev_private;
-	imxdrm->state = drm_atomic_helper_suspend(drm_dev);
-	if (IS_ERR(imxdrm->state)) {
-		drm_kms_helper_poll_enable(drm_dev);
-		return PTR_ERR(imxdrm->state);
-	}
 
-	return 0;
+	return drm_mode_config_helper_suspend(drm_dev);
 }
 
 static int imx_drm_resume(struct device *dev)
 {
 	struct drm_device *drm_dev = dev_get_drvdata(dev);
-	struct imx_drm_device *imx_drm;
-
-	if (drm_dev == NULL)
-		return 0;
 
-	imx_drm = drm_dev->dev_private;
-	drm_atomic_helper_resume(drm_dev, imx_drm->state);
-	drm_kms_helper_poll_enable(drm_dev);
-
-	return 0;
+	return drm_mode_config_helper_resume(drm_dev);
 }
 #endif
 
Signature · 1 line
1.9.1
#1 lore raw

Hi Souptick,

Quoted 5 lines · Souptick Joarder

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

Leonard pointed out earlier [1] that this makes the struct imx_drm_device superfluous, since imxdrm->state is the only remaining field and here you are removing its use. Could you remove struct imx_drm_device as well?

[1] https://patchwork.kernel.org/patch/10531473/

regards
Philipp

Quoted 48 lines
---
 drivers/gpu/drm/imx/imx-drm-core.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +2 -24
index 1d053bb..cdd83ea 100644
@@ -355,37 +355,15 @@ static int imx_drm_platform_remove(struct platform_device *pdev)
 static int imx_drm_suspend(struct device *dev)
 {
 	struct drm_device *drm_dev = dev_get_drvdata(dev);
-	struct imx_drm_device *imxdrm;
-
-	/* The drm_dev is NULL before .load hook is called */
-	if (drm_dev == NULL)
-		return 0;
-
-	drm_kms_helper_poll_disable(drm_dev);
-
-	imxdrm = drm_dev->dev_private;
-	imxdrm->state = drm_atomic_helper_suspend(drm_dev);
-	if (IS_ERR(imxdrm->state)) {
-		drm_kms_helper_poll_enable(drm_dev);
-		return PTR_ERR(imxdrm->state);
-	}
 
-	return 0;
+	return drm_mode_config_helper_suspend(drm_dev);
 }
 
 static int imx_drm_resume(struct device *dev)
 {
 	struct drm_device *drm_dev = dev_get_drvdata(dev);
-	struct imx_drm_device *imx_drm;
-
-	if (drm_dev == NULL)
-		return 0;
 
-	imx_drm = drm_dev->dev_private;
-	drm_atomic_helper_resume(drm_dev, imx_drm->state);
-	drm_kms_helper_poll_enable(drm_dev);
-
-	return 0;
+	return drm_mode_config_helper_resume(drm_dev);
 }
 #endif
 
#2 lore raw
Quoted 6 lines · Philipp Zabel

Hi Souptick,

Quoted 3 lines · Souptick Joarder

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

Quoted 7 lines
Quoted 2 lines

Leonard pointed out earlier [1] that this makes the struct imx_drm_device superfluous, since imxdrm->state is the only remaining field and here you are removing its use. Could you remove struct imx_drm_device as well?

Sure, Will remove it in v2.

Quoted 54 lines

[1] https://patchwork.kernel.org/patch/10531473/

regards
Philipp

Quoted 48 lines
---
 drivers/gpu/drm/imx/imx-drm-core.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +2 -24
index 1d053bb..cdd83ea 100644
@@ -355,37 +355,15 @@ static int imx_drm_platform_remove(struct platform_device *pdev)
 static int imx_drm_suspend(struct device *dev)
 {
      struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct imx_drm_device *imxdrm;
-
-     /* The drm_dev is NULL before .load hook is called */
-     if (drm_dev == NULL)
-             return 0;
-
-     drm_kms_helper_poll_disable(drm_dev);
-
-     imxdrm = drm_dev->dev_private;
-     imxdrm->state = drm_atomic_helper_suspend(drm_dev);
-     if (IS_ERR(imxdrm->state)) {
-             drm_kms_helper_poll_enable(drm_dev);
-             return PTR_ERR(imxdrm->state);
-     }
 
-     return 0;
+     return drm_mode_config_helper_suspend(drm_dev);
 }
 
 static int imx_drm_resume(struct device *dev)
 {
      struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct imx_drm_device *imx_drm;
-
-     if (drm_dev == NULL)
-             return 0;
 
-     imx_drm = drm_dev->dev_private;
-     drm_atomic_helper_resume(drm_dev, imx_drm->state);
-     drm_kms_helper_poll_enable(drm_dev);
-
-     return 0;
+     return drm_mode_config_helper_resume(drm_dev);
 }
 #endif