Skip to contentSkip to conversation

drm: Convert drm_atomic_helper_suspend/resume()

PATCH Superseded Souptick Joarder 3 participants 9 messages Jul 30, 2018 – Aug 13, 2018

Subsystems (5)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---
 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +2 -24
index feaa8bc..4e617e0 100644
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
-	struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-	if (!hdlcd)
-		return 0;
-
-	drm_kms_helper_poll_disable(drm);
-	drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-	hdlcd->state = drm_atomic_helper_suspend(drm);
-	if (IS_ERR(hdlcd->state)) {
-		drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-		drm_kms_helper_poll_enable(drm);
-		return PTR_ERR(hdlcd->state);
-	}
-
-	return 0;
+	return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
-	struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
-
-	if (!hdlcd)
-		return 0;
 
-	drm_atomic_helper_resume(drm, hdlcd->state);
-	drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-	drm_kms_helper_poll_enable(drm);
-
-	return 0;
+	return drm_mode_config_helper_resume(drm);
 }
 
 static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume);
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 186d00a..f604a84 100644
@@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state)
 		drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
 }
 EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
-
-/**
- * drm_fbdev_cma_set_suspend_unlocked - wrapper around
- *                                      drm_fb_helper_set_suspend_unlocked
- * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
- * @state: desired state, zero to resume, non-zero to suspend
- *
- * Calls drm_fb_helper_set_suspend, which is a wrapper around
- * fb_set_suspend implemented by fbdev core.
- */
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-					bool state)
-{
-	if (fbdev_cma)
-		drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
-						   state);
-}
-EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -19
index 02aee6c..288220f 100644
@@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev)
 static int rcar_du_pm_suspend(struct device *dev)
 {
 	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
-	struct drm_atomic_state *state;
 
-	drm_kms_helper_poll_disable(rcdu->ddev);
-	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-	state = drm_atomic_helper_suspend(rcdu->ddev);
-	if (IS_ERR(state)) {
-		drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-		drm_kms_helper_poll_enable(rcdu->ddev);
-		return PTR_ERR(state);
-	}
-
-	rcdu->suspend_state = state;
-
-	return 0;
+	return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
 	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-	drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-	drm_kms_helper_poll_enable(rcdu->ddev);
-
-	return 0;
+	return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
 
include/drm/drm_fb_cma_helper.h +0 -2
index d532f88a..15c4569 100644
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-					bool state);
 
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
 	unsigned int plane);
Signature · 1 line
1.9.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Souptick,

Thank you for the patch.

Quoted 97 lines · On Monday, 30 July 2018 22:01:37 EEST Souptick Joarder wrote:

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---
 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/arm/hdlcd_drv.c index feaa8bc..4e617e0 100644

drivers/gpu/drm/arm/hdlcd_drv.c +2 -24
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
-	struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-	if (!hdlcd)
-		return 0;
-
-	drm_kms_helper_poll_disable(drm);
-	drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-	hdlcd->state = drm_atomic_helper_suspend(drm);
-	if (IS_ERR(hdlcd->state)) {
-		drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-		drm_kms_helper_poll_enable(drm);
-		return PTR_ERR(hdlcd->state);
-	}
-
-	return 0;
+	return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
-	struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
-
-	if (!hdlcd)
-		return 0;
 
-	drm_atomic_helper_resume(drm, hdlcd->state);
-	drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-	drm_kms_helper_poll_enable(drm);
-
-	return 0;
+	return drm_mode_config_helper_resume(drm);
 }
 
 static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume);
(quoted diff) +0 -0

b/drivers/gpu/drm/drm_fb_cma_helper.c index 186d00a..f604a84 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
@@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma
 *fbdev_cma, bool state) drm_fb_helper_set_suspend(&fbdev_cma->fb_helper,
 state);
 }
 EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
-
-/**
- * drm_fbdev_cma_set_suspend_unlocked - wrapper around
- *                                      drm_fb_helper_set_suspend_unlocked
- * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
- * @state: desired state, zero to resume, non-zero to suspend
- *
- * Calls drm_fb_helper_set_suspend, which is a wrapper around
- * fb_set_suspend implemented by fbdev core.
- */
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-					bool state)
-{
-	if (fbdev_cma)
-		drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
-						   state);
-}
-EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 02aee6c..288220f 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.c +0 -2
@@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev)
 static int rcar_du_pm_suspend(struct device *dev)
 {
 	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
-	struct drm_atomic_state *state;
 
-	drm_kms_helper_poll_disable(rcdu->ddev);

drivers/gpu/drm/rcar-du/rcar_du_drv.c static void rcar_du_lastclose(struct drm_device *dev) · line 372

Quoted 10 lines
drivers/gpu/drm/rcar-du/rcar_du_drv.c +0 -10
-	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-	state = drm_atomic_helper_suspend(rcdu->ddev);
-	if (IS_ERR(state)) {
-		drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-		drm_kms_helper_poll_enable(rcdu->ddev);
-		return PTR_ERR(state);
-	}
-
-	rcdu->suspend_state = state;

If you further remove the suspend_state field from the rcar_du_device structure, you'll get my

Quoted 31 lines
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -7
-
-	return 0;
+	return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
 	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-	drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-	drm_kms_helper_poll_enable(rcdu->ddev);
-
-	return 0;
+	return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
 
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index d532f88a..15c4569 100644

include/drm/drm_fb_cma_helper.h +0 -0
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device
 *dev, void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);

void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma); void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);

include/drm/drm_fb_cma_helper.h +0 -2
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-					bool state);
 
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer

*fb, unsigned int plane);

Signature · 10 lines
Regards,

Laurent Pinchart



_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw
Quoted 5 lines

If you further remove the suspend_state field from the rcar_du_device structure, you'll get my

Sorry, missed it.

Quoted 39 lines
Quoted 30 lines
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -7
-
-     return 0;
+     return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-     drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-     drm_kms_helper_poll_enable(rcdu->ddev);
-
-     return 0;
+     return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index d532f88a..15c4569 100644

include/drm/drm_fb_cma_helper.h +0 -0
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device
 *dev, void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);

void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma); void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);

include/drm/drm_fb_cma_helper.h +0 -2
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state);
 
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer
Quoted 1 line

*fb, unsigned int plane);

--
Regards,

Laurent Pinchart

maintainer
#3 lore raw
In reply to Souptick Joarder

Hi Souptick,

Quoted 47 lines · Souptick Joarder

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---
 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -17
index feaa8bc..4e617e0 100644
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
-	struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-	if (!hdlcd)
-		return 0;
-
-	drm_kms_helper_poll_disable(drm);
-	drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-	hdlcd->state = drm_atomic_helper_suspend(drm);
-	if (IS_ERR(hdlcd->state)) {
-		drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-		drm_kms_helper_poll_enable(drm);
-		return PTR_ERR(hdlcd->state);
-	}
-
-	return 0;
+	return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
-	struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
-

drivers/gpu/drm/arm/hdlcd_drv.c static int hdlcd_remove(struct platform_device *pdev) · line 439

Quoted 10 lines
drivers/gpu/drm/arm/hdlcd_drv.c +1 -7
-	if (!hdlcd)
-		return 0;
 
-	drm_atomic_helper_resume(drm, hdlcd->state);
-	drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-	drm_kms_helper_poll_enable(drm);
-
-	return 0;
+	return drm_mode_config_helper_resume(drm);
 }

This patch is similar to the one Noralf Trønnes submitted, and his is also cleaning up the state variable in hdlcd_drm_private. The patch has been queued as commit f69d9686e5d9 in git://linux-arm.org/linux-ld.git
for-upstream/hdlcd and I will send a pull request today for it.

Best regards,
Liviu

Quoted 83 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0 -0
 static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume);
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 186d00a..f604a84 100644
@@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state)
 		drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
 }
 EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
-
-/**
- * drm_fbdev_cma_set_suspend_unlocked - wrapper around
- *                                      drm_fb_helper_set_suspend_unlocked
- * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
- * @state: desired state, zero to resume, non-zero to suspend
- *
- * Calls drm_fb_helper_set_suspend, which is a wrapper around
- * fb_set_suspend implemented by fbdev core.
- */
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-					bool state)
-{
-	if (fbdev_cma)
-		drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
-						   state);
-}
-EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -19
index 02aee6c..288220f 100644
@@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev)
 static int rcar_du_pm_suspend(struct device *dev)
 {
 	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
-	struct drm_atomic_state *state;
 
-	drm_kms_helper_poll_disable(rcdu->ddev);
-	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-	state = drm_atomic_helper_suspend(rcdu->ddev);
-	if (IS_ERR(state)) {
-		drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-		drm_kms_helper_poll_enable(rcdu->ddev);
-		return PTR_ERR(state);
-	}
-
-	rcdu->suspend_state = state;
-
-	return 0;
+	return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
 	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-	drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-	drm_kms_helper_poll_enable(rcdu->ddev);
-
-	return 0;
+	return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
 
include/drm/drm_fb_cma_helper.h +0 -2
index d532f88a..15c4569 100644
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-					bool state);
 
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
 	unsigned int plane);
Signature · 1 line
1.9.1
Signature · 12 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#4 lore raw
Quoted 66 lines · Liviu Dudau

Hi Souptick,

Quoted 47 lines · Souptick Joarder

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---
 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -17
index feaa8bc..4e617e0 100644
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-     if (!hdlcd)
-             return 0;
-
-     drm_kms_helper_poll_disable(drm);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-     hdlcd->state = drm_atomic_helper_suspend(drm);
-     if (IS_ERR(hdlcd->state)) {
-             drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-             drm_kms_helper_poll_enable(drm);
-             return PTR_ERR(hdlcd->state);
-     }
-
-     return 0;
+     return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
-

drivers/gpu/drm/arm/hdlcd_drv.c static int hdlcd_remove(struct platform_device *pdev) · line 439

Quoted 10 lines
drivers/gpu/drm/arm/hdlcd_drv.c +1 -7
-     if (!hdlcd)
-             return 0;
 
-     drm_atomic_helper_resume(drm, hdlcd->state);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-     drm_kms_helper_poll_enable(drm);
-
-     return 0;
+     return drm_mode_config_helper_resume(drm);
 }

This patch is similar to the one Noralf Trønnes submitted, and his is also cleaning up the state variable in hdlcd_drm_private. The patch has been queued as commit f69d9686e5d9 in git://linux-arm.org/linux-ld.git
for-upstream/hdlcd and I will send a pull request today for it.

Quoted 2 lines

Best regards,
Liviu

unable to clone this repository.
can you please post the patchwork link ?

Quoted 94 lines
Quoted 82 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0 -0
 static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume);
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 186d00a..f604a84 100644
@@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state)
              drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
 }
 EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
-
-/**
- * drm_fbdev_cma_set_suspend_unlocked - wrapper around
- *                                      drm_fb_helper_set_suspend_unlocked
- * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
- * @state: desired state, zero to resume, non-zero to suspend
- *
- * Calls drm_fb_helper_set_suspend, which is a wrapper around
- * fb_set_suspend implemented by fbdev core.
- */
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state)
-{
-     if (fbdev_cma)
-             drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
-                                                state);
-}
-EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -19
index 02aee6c..288220f 100644
@@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev)
 static int rcar_du_pm_suspend(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
-     struct drm_atomic_state *state;
 
-     drm_kms_helper_poll_disable(rcdu->ddev);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-     state = drm_atomic_helper_suspend(rcdu->ddev);
-     if (IS_ERR(state)) {
-             drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-             drm_kms_helper_poll_enable(rcdu->ddev);
-             return PTR_ERR(state);
-     }
-
-     rcdu->suspend_state = state;
-
-     return 0;
+     return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-     drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-     drm_kms_helper_poll_enable(rcdu->ddev);
-
-     return 0;
+     return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
 
include/drm/drm_fb_cma_helper.h +0 -3
index d532f88a..15c4569 100644
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state);
 
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
      unsigned int plane);
--
Quoted 2 lines

1.9.1

--
====================

| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
#5 lore raw
Quoted 67 lines · Souptick Joarder
Quoted 66 lines · Liviu Dudau

Hi Souptick,

Quoted 47 lines · Souptick Joarder

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---
 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -17
index feaa8bc..4e617e0 100644
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-     if (!hdlcd)
-             return 0;
-
-     drm_kms_helper_poll_disable(drm);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-     hdlcd->state = drm_atomic_helper_suspend(drm);
-     if (IS_ERR(hdlcd->state)) {
-             drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-             drm_kms_helper_poll_enable(drm);
-             return PTR_ERR(hdlcd->state);
-     }
-
-     return 0;
+     return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
-

drivers/gpu/drm/arm/hdlcd_drv.c static int hdlcd_remove(struct platform_device *pdev) · line 439

Quoted 10 lines
drivers/gpu/drm/arm/hdlcd_drv.c +1 -7
-     if (!hdlcd)
-             return 0;
 
-     drm_atomic_helper_resume(drm, hdlcd->state);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-     drm_kms_helper_poll_enable(drm);
-
-     return 0;
+     return drm_mode_config_helper_resume(drm);
 }

This patch is similar to the one Noralf Trønnes submitted, and his is also cleaning up the state variable in hdlcd_drm_private. The patch has been queued as commit f69d9686e5d9 in git://linux-arm.org/linux-ld.git
for-upstream/hdlcd and I will send a pull request today for it.

Quoted 5 lines
Quoted 2 lines

Best regards,
Liviu

unable to clone this repository.
can you please post the patchwork link ?

Liviu, is commit f69d9686e5d9 in
git://linux-arm.org/linux-ld.gitfor-upstream/hdlcd
contains only changes in drivers/gpu/drm/arm/hdlcd_drv.c driver ??

Quoted 95 lines
Quoted 95 lines
Quoted 83 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0 -0
 static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume);
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 186d00a..f604a84 100644
@@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state)
              drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
 }
 EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
-
-/**
- * drm_fbdev_cma_set_suspend_unlocked - wrapper around
- *                                      drm_fb_helper_set_suspend_unlocked
- * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
- * @state: desired state, zero to resume, non-zero to suspend
- *
- * Calls drm_fb_helper_set_suspend, which is a wrapper around
- * fb_set_suspend implemented by fbdev core.
- */
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state)
-{
-     if (fbdev_cma)
-             drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
-                                                state);
-}
-EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -19
index 02aee6c..288220f 100644
@@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev)
 static int rcar_du_pm_suspend(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
-     struct drm_atomic_state *state;
 
-     drm_kms_helper_poll_disable(rcdu->ddev);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-     state = drm_atomic_helper_suspend(rcdu->ddev);
-     if (IS_ERR(state)) {
-             drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-             drm_kms_helper_poll_enable(rcdu->ddev);
-             return PTR_ERR(state);
-     }
-
-     rcdu->suspend_state = state;
-
-     return 0;
+     return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-     drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-     drm_kms_helper_poll_enable(rcdu->ddev);
-
-     return 0;
+     return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
 
include/drm/drm_fb_cma_helper.h +0 -3
index d532f88a..15c4569 100644
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state);
 
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
      unsigned int plane);
--
Quoted 2 lines

1.9.1

--
====================

| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
maintainer
#6 lore raw
Quoted 68 lines · Souptick Joarder
Quoted 67 lines · Souptick Joarder
Quoted 66 lines · Liviu Dudau

Hi Souptick,

Quoted 47 lines · Souptick Joarder

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---
 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -17
index feaa8bc..4e617e0 100644
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-     if (!hdlcd)
-             return 0;
-
-     drm_kms_helper_poll_disable(drm);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-     hdlcd->state = drm_atomic_helper_suspend(drm);
-     if (IS_ERR(hdlcd->state)) {
-             drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-             drm_kms_helper_poll_enable(drm);
-             return PTR_ERR(hdlcd->state);
-     }
-
-     return 0;
+     return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
-

drivers/gpu/drm/arm/hdlcd_drv.c static int hdlcd_remove(struct platform_device *pdev) · line 439

Quoted 10 lines
drivers/gpu/drm/arm/hdlcd_drv.c +1 -7
-     if (!hdlcd)
-             return 0;
 
-     drm_atomic_helper_resume(drm, hdlcd->state);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-     drm_kms_helper_poll_enable(drm);
-
-     return 0;
+     return drm_mode_config_helper_resume(drm);
 }

This patch is similar to the one Noralf Trønnes submitted, and his is also cleaning up the state variable in hdlcd_drm_private. The patch has been queued as commit f69d9686e5d9 in git://linux-arm.org/linux-ld.git
for-upstream/hdlcd and I will send a pull request today for it.

Quoted 5 lines
Quoted 5 lines
Quoted 2 lines

Best regards,
Liviu

unable to clone this repository.
can you please post the patchwork link ?

Sorry, I was on holiday until today.

Quoted 4 lines

Liviu, is commit f69d9686e5d9 in
git://linux-arm.org/linux-ld.gitfor-upstream/hdlcd
contains only changes in drivers/gpu/drm/arm/hdlcd_drv.c driver ??

That's right, that tree only deals with HDLCD changes. The rest of the patch is up to you to upstream into drm-misc.

Best regards,
Liviu

Quoted 96 lines
Quoted 96 lines
Quoted 96 lines
Quoted 84 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0 -0
 static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume);
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 186d00a..f604a84 100644
@@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state)
              drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
 }
 EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
-
-/**
- * drm_fbdev_cma_set_suspend_unlocked - wrapper around
- *                                      drm_fb_helper_set_suspend_unlocked
- * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
- * @state: desired state, zero to resume, non-zero to suspend
- *
- * Calls drm_fb_helper_set_suspend, which is a wrapper around
- * fb_set_suspend implemented by fbdev core.
- */
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state)
-{
-     if (fbdev_cma)
-             drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
-                                                state);
-}
-EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -19
index 02aee6c..288220f 100644
@@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev)
 static int rcar_du_pm_suspend(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
-     struct drm_atomic_state *state;
 
-     drm_kms_helper_poll_disable(rcdu->ddev);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-     state = drm_atomic_helper_suspend(rcdu->ddev);
-     if (IS_ERR(state)) {
-             drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-             drm_kms_helper_poll_enable(rcdu->ddev);
-             return PTR_ERR(state);
-     }
-
-     rcdu->suspend_state = state;
-
-     return 0;
+     return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-     drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-     drm_kms_helper_poll_enable(rcdu->ddev);
-
-     return 0;
+     return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
 
include/drm/drm_fb_cma_helper.h +0 -3
index d532f88a..15c4569 100644
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state);
 
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
      unsigned int plane);
--
Quoted 2 lines

1.9.1

--
====================

| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
Signature · 12 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#7 lore raw

Hi Laurent,

Quoted 82 lines · Liviu Dudau
Quoted 68 lines · Souptick Joarder
Quoted 67 lines · Souptick Joarder
Quoted 66 lines · Liviu Dudau

Hi Souptick,

Quoted 47 lines · Souptick Joarder

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---
 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +1 -17
index feaa8bc..4e617e0 100644
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
 
-     if (!hdlcd)
-             return 0;
-
-     drm_kms_helper_poll_disable(drm);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-     hdlcd->state = drm_atomic_helper_suspend(drm);
-     if (IS_ERR(hdlcd->state)) {
-             drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-             drm_kms_helper_poll_enable(drm);
-             return PTR_ERR(hdlcd->state);
-     }
-
-     return 0;
+     return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private : NULL;
-

drivers/gpu/drm/arm/hdlcd_drv.c static int hdlcd_remove(struct platform_device *pdev) · line 439

Quoted 10 lines
drivers/gpu/drm/arm/hdlcd_drv.c +1 -7
-     if (!hdlcd)
-             return 0;
 
-     drm_atomic_helper_resume(drm, hdlcd->state);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-     drm_kms_helper_poll_enable(drm);
-
-     return 0;
+     return drm_mode_config_helper_resume(drm);
 }

This patch is similar to the one Noralf Trønnes submitted, and his is also cleaning up the state variable in hdlcd_drm_private. The patch has been queued as commit f69d9686e5d9 in git://linux-arm.org/linux-ld.git
for-upstream/hdlcd and I will send a pull request today for it.

Quoted 5 lines
Quoted 5 lines
Quoted 2 lines

Best regards,
Liviu

unable to clone this repository.
can you please post the patchwork link ?

Sorry, I was on holiday until today.

Quoted 4 lines

Liviu, is commit f69d9686e5d9 in
git://linux-arm.org/linux-ld.gitfor-upstream/hdlcd
contains only changes in drivers/gpu/drm/arm/hdlcd_drv.c driver ??

Quoted 5 lines

That's right, that tree only deals with HDLCD changes. The rest of the patch is up to you to upstream into drm-misc.

Best regards,
Liviu

As Liviu mentioned, drivers/gpu/drm/arm/hdlcd_drv.c is only changed, so we left with drivers/gpu/drm/rcar-du/rcar_du_drv.c and remove drm_fbdev_cma_set_suspend_unlocked().

Would you like to see both rcar_du driver change and removing drm_fbdev_cma_set_suspend_unlocked() in a single commit ?? or 2 different commit ?

Quoted 107 lines
Quoted 82 lines
Quoted 82 lines
Quoted 82 lines
Quoted 82 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0 -0
 static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume);
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 186d00a..f604a84 100644
@@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state)
              drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
 }
 EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
-
-/**
- * drm_fbdev_cma_set_suspend_unlocked - wrapper around
- *                                      drm_fb_helper_set_suspend_unlocked
- * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
- * @state: desired state, zero to resume, non-zero to suspend
- *
- * Calls drm_fb_helper_set_suspend, which is a wrapper around
- * fb_set_suspend implemented by fbdev core.
- */
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state)
-{
-     if (fbdev_cma)
-             drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
-                                                state);
-}
-EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -19
index 02aee6c..288220f 100644
@@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev)
 static int rcar_du_pm_suspend(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
-     struct drm_atomic_state *state;
 
-     drm_kms_helper_poll_disable(rcdu->ddev);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-     state = drm_atomic_helper_suspend(rcdu->ddev);
-     if (IS_ERR(state)) {
-             drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-             drm_kms_helper_poll_enable(rcdu->ddev);
-             return PTR_ERR(state);
-     }
-
-     rcdu->suspend_state = state;
-
-     return 0;
+     return drm_mode_config_helper_suspend(rcdu->ddev);
 }
 
 static int rcar_du_pm_resume(struct device *dev)
 {
      struct rcar_du_device *rcdu = dev_get_drvdata(dev);
 
-     drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
-     drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
-     drm_kms_helper_poll_enable(rcdu->ddev);
-
-     return 0;
+     return drm_mode_config_helper_resume(rcdu->ddev);
 }
 #endif
 
include/drm/drm_fb_cma_helper.h +0 -2
index d532f88a..15c4569 100644
@@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
 void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
 void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);
-void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
-                                     bool state);
 
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
include/drm/drm_fb_cma_helper.h +0 -1
 struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
      unsigned int plane);
--

1.9.1

Quoted 9 lines
Quoted 9 lines

--
====================

| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯

--
====================

| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
#8 lore raw

Hi Souptick,

Quoted 85 lines · On Monday, 13 August 2018 21:51:31 EEST Souptick Joarder wrote:
Quoted 75 lines · Liviu Dudau
Quoted 71 lines · Souptick Joarder
Quoted 70 lines · Souptick Joarder
Quoted 68 lines · Liviu Dudau
Quoted 60 lines · Souptick Joarder

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

With this conversion, drm_fbdev_cma_set_suspend_unlocked() will left with no consumer. So this function can be removed.

---

 drivers/gpu/drm/arm/hdlcd_drv.c       | 26 ++------------------------
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 4 insertions(+), 63 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/arm/hdlcd_drv.c index feaa8bc..4e617e0 100644

drivers/gpu/drm/arm/hdlcd_drv.c +2 -24
@@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device
 *pdev)
 static int __maybe_unused hdlcd_pm_suspend(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private :
 NULL;
 
-     if (!hdlcd)
-             return 0;
-
-     drm_kms_helper_poll_disable(drm);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1);
-
-     hdlcd->state = drm_atomic_helper_suspend(drm);
-     if (IS_ERR(hdlcd->state)) {
-             drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-             drm_kms_helper_poll_enable(drm);
-             return PTR_ERR(hdlcd->state);
-     }
-
-     return 0;
+     return drm_mode_config_helper_suspend(drm);
 }
 
 static int __maybe_unused hdlcd_pm_resume(struct device *dev)
 {
      struct drm_device *drm = dev_get_drvdata(dev);
-     struct hdlcd_drm_private *hdlcd = drm ? drm->dev_private :
 NULL;
-
-     if (!hdlcd)
-             return 0;
 
-     drm_atomic_helper_resume(drm, hdlcd->state);
-     drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0);
-     drm_kms_helper_poll_enable(drm);
-
-     return 0;
+     return drm_mode_config_helper_resume(drm);
Quoted 1 line

}

This patch is similar to the one Noralf Trønnes submitted, and his is also cleaning up the state variable in hdlcd_drm_private. The patch has been queued as commit f69d9686e5d9 in git://linux-arm.org/
linux-ld.git for-upstream/hdlcd and I will send a pull request today for it.

Quoted 2 lines
Quoted 2 lines

unable to clone this repository.
can you please post the patchwork link ?

Quoted 8 lines

Sorry, I was on holiday until today.

Quoted 3 lines

Liviu, is commit f69d9686e5d9 in
git://linux-arm.org/linux-ld.gitfor-upstream/hdlcd
contains only changes in drivers/gpu/drm/arm/hdlcd_drv.c driver ??

That's right, that tree only deals with HDLCD changes. The rest of the patch is up to you to upstream into drm-misc.

Quoted 7 lines

As Liviu mentioned, drivers/gpu/drm/arm/hdlcd_drv.c is only changed, so we left with drivers/gpu/drm/rcar-du/rcar_du_drv.c and remove drm_fbdev_cma_set_suspend_unlocked().

Would you like to see both rcar_du driver change and removing drm_fbdev_cma_set_suspend_unlocked() in a single commit ?? or 2 different commit ?

I have a slight preference for two patches, but I'm fine with either. If you decide to go for two patches, please make sure they get upstreamed at the same time.

Thanks for handling this.

[snip]

Signature · 3 lines
Regards,

Laurent Pinchart