Skip to contentSkip to conversation

drm/rcar-du: Convert drm_atomic_helper_suspend/resume()

PATCH In review Souptick Joarder 4 participants 14 messages Sep 18, 2018 – Oct 23, 2018

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

PATCH 1/1 drm/rcar-du: Convert drm_atomic_helper_suspend/resume()

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

---
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.h |  1 -
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 2 insertions(+), 40 deletions(-)
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 47e0e2f..96efc88 100644
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma)
 		drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
-
-/**
- * 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
 
drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
index b3a25e8..ff25c8d 100644
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
 	struct drm_device *ddev;
 	struct drm_fbdev_cma *fbdev;
-	struct drm_atomic_state *suspend_state;
 
 	struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
 	unsigned int num_crtcs;
include/drm/drm_fb_cma_helper.h +0 -2
index 4a65f0d..8dbbe1e 100644
@@ -26,8 +26,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_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
#1 lore raw
Quoted 11 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

Laurent, any comment on this patch ??

Quoted 100 lines
---
 drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
 drivers/gpu/drm/rcar-du/rcar_du_drv.h |  1 -
 include/drm/drm_fb_cma_helper.h       |  2 --
 4 files changed, 2 insertions(+), 40 deletions(-)
drivers/gpu/drm/drm_fb_cma_helper.c +0 -18
index 47e0e2f..96efc88 100644
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma)
                drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
-
-/**
- * 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
 
drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
index b3a25e8..ff25c8d 100644
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
        struct drm_device *ddev;
        struct drm_fbdev_cma *fbdev;
-       struct drm_atomic_state *suspend_state;
 
        struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
        unsigned int num_crtcs;
include/drm/drm_fb_cma_helper.h +0 -3
index 4a65f0d..8dbbe1e 100644
@@ -26,8 +26,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_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);
--

1.9.1

Reviewed-by
#2 lore raw

Hi Souptick,

Thank you for the patch.

Quoted 7 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 6 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

Quoted 6 lines
Quoted 4 lines

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

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc as it touches drm_fb_cma_helper.c ?

Quoted 113 lines
Quoted 113 lines

---

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

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma
 *fbdev_cma)> 
                drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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.
- */

drivers/gpu/drm/drm_fb_cma_helper.c +0 -8
-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 +2 -19
@@ -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
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
        struct drm_device *ddev;
        struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
        struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
        unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -0
@@ -26,8 +26,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);

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 · 3 lines
Regards,

Laurent Pinchart
#3 lore raw

Hi Souptick,

Quoted 13 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 12 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 10 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

Quoted 8 lines
Quoted 1 line

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a year ago, and was later superseded by https://patchwork.freedesktop.org/patch/
247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 108 lines
Quoted 108 lines
Quoted 108 lines

---

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

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
                drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-              

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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

(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
        struct drm_device *ddev;
        struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
        struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
        unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_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 · 3 lines
Regards,

Laurent Pinchart
#4 lore raw
Quoted 24 lines · Laurent Pinchart

Hi Souptick,

Quoted 20 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 7 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 6 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

Quoted 6 lines
Quoted 4 lines

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

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through

drm-misc

Quoted 3 lines
Quoted 1 line

as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly

a

Quoted 1 line

year ago, and was later superseded by

https://patchwork.freedesktop.org/patch/

Quoted 1 line

247861/. I think we should thus apply Noralf's patches instead (once he

sends

Quoted 1 line

v4 out).

Sure, you can go ahead with his patch.

Shall I remove drm_fbdev_cma_set_suspend_unlocked in a separate patch once all the consumer remove this function ?

Quoted 52 lines
Quoted 52 lines
Quoted 52 lines
Quoted 52 lines

---

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

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
                drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 -1
@@ -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;
 
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

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

Quoted 6 lines
drivers/gpu/drm/rcar-du/rcar_du_drv.c +0 -6
-       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);

Quoted 48 lines
Quoted 48 lines
Quoted 48 lines
Quoted 48 lines
drivers/gpu/drm/rcar-du/rcar_du_drv.c +2 -12
-               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

(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
        struct drm_device *ddev;
        struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
        struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
        unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_unlocked(struct drm_fbdev_cma
 *fbdev_cma,
-                                       bool state);
 
Quoted 11 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,

        unsigned int plane);

--
Regards,

Laurent Pinchart

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw

Hi Souptick,

Quoted 29 lines · On Friday, 28 September 2018 23:02:32 EEST Souptick Joarder wrote:
Quoted 20 lines · Laurent Pinchart
Quoted 19 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 7 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 6 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

Quoted 6 lines
Quoted 4 lines

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

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Quoted 7 lines
Quoted 2 lines

Should I apply this to my tree or do you plan to merge it through drm-misc as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a year ago, and was later superseded by https://patchwork.freedesktop.org/
patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 4 lines

Sure, you can go ahead with his patch.

Shall I remove drm_fbdev_cma_set_suspend_unlocked in a separate patch once all the consumer remove this function ?

Sure, if the function isn't removed as part of Noralf's patch series, please send a separate patch to remove it.

Signature · 3 lines
Regards,

Laurent Pinchart
#6 lore raw
In reply to Laurent Pinchart
Quoted 22 lines · Laurent Pinchart

Hi Souptick,

Quoted 19 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 7 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 6 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

Quoted 6 lines
Quoted 4 lines

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

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Quoted 7 lines
Quoted 2 lines

Should I apply this to my tree or do you plan to merge it through drm-misc as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a year ago, and was later superseded by https://patchwork.freedesktop.org/patch/
247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Cheers, Daniel

Quoted 117 lines
Quoted 109 lines
Quoted 109 lines
Quoted 109 lines

---

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

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
                drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-              

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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

(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
        struct drm_device *ddev;
        struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
        struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
        unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_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 · 3 lines
Regards,

Laurent Pinchart
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
#7 lore raw

Hi Daniel,

Quoted 31 lines · On Monday, 1 October 2018 09:52:20 EEST Daniel Vetter wrote:
Quoted 24 lines · Laurent Pinchart
Quoted 15 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 7 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 6 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

Quoted 6 lines
Quoted 4 lines

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

Laurent, any comment on this patch ??

Quoted 7 lines

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc
as it touches drm_fb_cma_helper.c ?

Quoted 5 lines

I just realized that the same patch got supplied by Noralf Trønnes nearly a
year ago, and was later superseded by
https://patchwork.freedesktop.org/patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 3 lines

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Isn't https://patchwork.freedesktop.org/patch/247861/ part of the fbdev emulation stuff ? That patch series is from less than a month ago, so I thought it was actively developed.

Let's ask him. Noralf, any comment ? :-)

Quoted 120 lines
Quoted 120 lines
Quoted 120 lines
Quoted 120 lines
Quoted 120 lines

---

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

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
 
                drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 
 }
 EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
        struct drm_device *ddev;
        struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
        struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
        unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_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
#8 lore raw

Den 01.10.2018 13.56, skrev Laurent Pinchart:

Quoted 30 lines

Hi Daniel,

Quoted 27 lines · On Monday, 1 October 2018 09:52:20 EEST Daniel Vetter wrote:
Quoted 26 lines · Laurent Pinchart
Quoted 12 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 11 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 10 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

Quoted 8 lines
Quoted 1 line

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc
as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a
year ago, and was later superseded by
https://patchwork.freedesktop.org/patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 8 lines
Quoted 3 lines

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Isn't https://patchwork.freedesktop.org/patch/247861/ part of the fbdev emulation stuff ? That patch series is from less than a month ago, so I thought it was actively developed.

Let's ask him. Noralf, any comment ? :-)

I see now that I've caused some confusion here.

I did some refactoring of the fbdev stuff in the CMA helper last year. In the last series of that work there is this patch:

[v3,07/11] drm/rcar-du: Use drm_mode_config_helper_suspend/resume()
https://patchwork.freedesktop.org/patch/192414/

During Christmas I got the idea that maybe it was possible to use a dumb buffer to do generic fbdev emulation. That work took me 6 months before a solution using a general internal DRM client was hammered out. By the time I started to convert drivers I had forgotten about that patch.

When I wrote the patch (#247861) to convert rcar to the generic fbdev, I just bundled up the suspend/resume change with the fbdev conversion. Laurent and Sam commented on that bundling, so I said that I would split it up in the next version.

All that being said, I think that this patch should be applied and I'll just rebase the rcar fbdev conversion patch on top of that. It's the easiest for me at least :-)

Noralf.

Quoted 112 lines
Quoted 112 lines
Quoted 112 lines
Quoted 112 lines
Quoted 112 lines
Quoted 112 lines

---

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

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
 
                 drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 
  }
  EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
         struct drm_device *ddev;
         struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
         struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
         unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -0
@@ -26,8 +26,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);
 
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
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);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#9 lore raw

Hi Laurent,

Quoted 55 lines · Noralf Trønnes

Den 01.10.2018 13.56, skrev Laurent Pinchart:

Quoted 30 lines

Hi Daniel,

Quoted 27 lines · On Monday, 1 October 2018 09:52:20 EEST Daniel Vetter wrote:
Quoted 26 lines · Laurent Pinchart
Quoted 12 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 11 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 10 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

Quoted 8 lines
Quoted 1 line

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc
as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a
year ago, and was later superseded by
https://patchwork.freedesktop.org/patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 8 lines
Quoted 3 lines

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Isn't https://patchwork.freedesktop.org/patch/247861/ part of the fbdev emulation stuff ? That patch series is from less than a month ago, so I thought it was actively developed.

Let's ask him. Noralf, any comment ? :-)

I see now that I've caused some confusion here.

I did some refactoring of the fbdev stuff in the CMA helper last year. In the last series of that work there is this patch:

[v3,07/11] drm/rcar-du: Use drm_mode_config_helper_suspend/resume()
https://patchwork.freedesktop.org/patch/192414/

During Christmas I got the idea that maybe it was possible to use a dumb buffer to do generic fbdev emulation. That work took me 6 months before a solution using a general internal DRM client was hammered out. By the time I started to convert drivers I had forgotten about that patch.

Quoted 9 lines

When I wrote the patch (#247861) to convert rcar to the generic fbdev, I just bundled up the suspend/resume change with the fbdev conversion. Laurent and Sam commented on that bundling, so I said that I would split it up in the next version.

All that being said, I think that this patch should be applied and I'll just rebase the rcar fbdev conversion patch on top of that. It's the easiest for me at least :-)

Any conclusion on this patch ? :-)

ers/gpu/drm/drm_fb_cma_helper.c | 18 ------------------

Quoted 118 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
  drivers/gpu/drm/rcar-du/rcar_du_drv.h |  1 -
  include/drm/drm_fb_cma_helper.h       |  2 --
  4 files changed, 2 insertions(+), 40 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
 
                 drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 
  }
  EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
         struct drm_device *ddev;
         struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
         struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
         unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_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);
#10 lore raw
Quoted 62 lines · Souptick Joarder

Hi Laurent,

Quoted 60 lines · Noralf Trønnes

Den 01.10.2018 13.56, skrev Laurent Pinchart:

Quoted 30 lines

Hi Daniel,

Quoted 27 lines · On Monday, 1 October 2018 09:52:20 EEST Daniel Vetter wrote:
Quoted 26 lines · Laurent Pinchart
Quoted 12 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 11 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 10 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

Quoted 8 lines
Quoted 1 line

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc
as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a
year ago, and was later superseded by
https://patchwork.freedesktop.org/patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 8 lines
Quoted 3 lines

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Isn't https://patchwork.freedesktop.org/patch/247861/ part of the fbdev emulation stuff ? That patch series is from less than a month ago, so I thought it was actively developed.

Let's ask him. Noralf, any comment ? :-)

I see now that I've caused some confusion here.

I did some refactoring of the fbdev stuff in the CMA helper last year. In the last series of that work there is this patch:

[v3,07/11] drm/rcar-du: Use drm_mode_config_helper_suspend/resume()
https://patchwork.freedesktop.org/patch/192414/

During Christmas I got the idea that maybe it was possible to use a dumb buffer to do generic fbdev emulation. That work took me 6 months before a solution using a general internal DRM client was hammered out. By the time I started to convert drivers I had forgotten about that patch.

When I wrote the patch (#247861) to convert rcar to the generic fbdev, I just bundled up the suspend/resume change with the fbdev conversion. Laurent and Sam commented on that bundling, so I said that I would split it up in the next version.

Quoted 5 lines
Quoted 4 lines

All that being said, I think that this patch should be applied and I'll just rebase the rcar fbdev conversion patch on top of that. It's the easiest for me at least :-)

Any conclusion on this patch ? :-)

Laurent should pick it up and apply to his rcar-du tree I think. We can also stuff it into drm-misc as a fallback.
-Daniel

Quoted 120 lines

ers/gpu/drm/drm_fb_cma_helper.c | 18 ------------------

Quoted 118 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
  drivers/gpu/drm/rcar-du/rcar_du_drv.h |  1 -
  include/drm/drm_fb_cma_helper.h       |  2 --
  4 files changed, 2 insertions(+), 40 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
 
                 drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 
  }
  EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
         struct drm_device *ddev;
         struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
         struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
         unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_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 · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
#11 lore raw

Hi Laurent,

Quoted 64 lines · Daniel Vetter
Quoted 62 lines · Souptick Joarder

Hi Laurent,

Quoted 60 lines · Noralf Trønnes

Den 01.10.2018 13.56, skrev Laurent Pinchart:

Quoted 30 lines

Hi Daniel,

Quoted 27 lines · On Monday, 1 October 2018 09:52:20 EEST Daniel Vetter wrote:
Quoted 26 lines · Laurent Pinchart
Quoted 12 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 11 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 10 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

Quoted 8 lines
Quoted 1 line

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc
as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a
year ago, and was later superseded by
https://patchwork.freedesktop.org/patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 8 lines
Quoted 3 lines

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Isn't https://patchwork.freedesktop.org/patch/247861/ part of the fbdev emulation stuff ? That patch series is from less than a month ago, so I thought it was actively developed.

Let's ask him. Noralf, any comment ? :-)

I see now that I've caused some confusion here.

I did some refactoring of the fbdev stuff in the CMA helper last year. In the last series of that work there is this patch:

[v3,07/11] drm/rcar-du: Use drm_mode_config_helper_suspend/resume()
https://patchwork.freedesktop.org/patch/192414/

During Christmas I got the idea that maybe it was possible to use a dumb buffer to do generic fbdev emulation. That work took me 6 months before a solution using a general internal DRM client was hammered out. By the time I started to convert drivers I had forgotten about that patch.

When I wrote the patch (#247861) to convert rcar to the generic fbdev, I just bundled up the suspend/resume change with the fbdev conversion. Laurent and Sam commented on that bundling, so I said that I would split it up in the next version.

Quoted 8 lines
Quoted 5 lines
Quoted 4 lines

All that being said, I think that this patch should be applied and I'll just rebase the rcar fbdev conversion patch on top of that. It's the easiest for me at least :-)

Any conclusion on this patch ? :-)

Laurent should pick it up and apply to his rcar-du tree I think. We can also stuff it into drm-misc as a fallback.

Can we get this patch in queue for 4.20 ?

Quoted 127 lines

-Daniel

Quoted 120 lines

ers/gpu/drm/drm_fb_cma_helper.c | 18 ------------------

Quoted 118 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
  drivers/gpu/drm/rcar-du/rcar_du_drv.h |  1 -
  include/drm/drm_fb_cma_helper.h       |  2 --
  4 files changed, 2 insertions(+), 40 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
 
                 drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 
  }
  EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
         struct drm_device *ddev;
         struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
         struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
         unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_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);

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

#12 lore raw
Quoted 71 lines · Souptick Joarder

Hi Laurent,

Quoted 68 lines · Daniel Vetter
Quoted 66 lines · Souptick Joarder

Hi Laurent,

Quoted 64 lines · Noralf Trønnes

Den 01.10.2018 13.56, skrev Laurent Pinchart:

Quoted 30 lines

Hi Daniel,

Quoted 27 lines · On Monday, 1 October 2018 09:52:20 EEST Daniel Vetter wrote:
Quoted 26 lines · Laurent Pinchart
Quoted 12 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 11 lines · On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote:
Quoted 10 lines · Souptick Joarder

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

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

Quoted 8 lines
Quoted 1 line

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Should I apply this to my tree or do you plan to merge it through drm-misc
as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a
year ago, and was later superseded by
https://patchwork.freedesktop.org/patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 8 lines
Quoted 3 lines

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Isn't https://patchwork.freedesktop.org/patch/247861/ part of the fbdev emulation stuff ? That patch series is from less than a month ago, so I thought it was actively developed.

Let's ask him. Noralf, any comment ? :-)

I see now that I've caused some confusion here.

I did some refactoring of the fbdev stuff in the CMA helper last year. In the last series of that work there is this patch:

[v3,07/11] drm/rcar-du: Use drm_mode_config_helper_suspend/resume()
https://patchwork.freedesktop.org/patch/192414/

During Christmas I got the idea that maybe it was possible to use a dumb buffer to do generic fbdev emulation. That work took me 6 months before a solution using a general internal DRM client was hammered out. By the time I started to convert drivers I had forgotten about that patch.

When I wrote the patch (#247861) to convert rcar to the generic fbdev, I just bundled up the suspend/resume change with the fbdev conversion. Laurent and Sam commented on that bundling, so I said that I would split it up in the next version.

All that being said, I think that this patch should be applied and I'll just rebase the rcar fbdev conversion patch on top of that. It's the easiest for me at least :-)

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Any conclusion on this patch ? :-)

Laurent should pick it up and apply to his rcar-du tree I think. We can also stuff it into drm-misc as a fallback.

Can we get this patch in queue for 4.20 ?

5.1, 4.20 is already done.

But yes, I pulled this into drm-misc-next. Thanks for your patch. -Daniel

Quoted 128 lines
Quoted 128 lines

-Daniel

Quoted 120 lines

ers/gpu/drm/drm_fb_cma_helper.c | 18 ------------------

Quoted 118 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
Quoted 117 lines
  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-------------------
  drivers/gpu/drm/rcar-du/rcar_du_drv.h |  1 -
  include/drm/drm_fb_cma_helper.h       |  2 --
  4 files changed, 2 insertions(+), 40 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
@@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct
 drm_fbdev_cma *fbdev_cma)
 
                 drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
 
  }
  EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
 
-
-/**
- * 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,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -4
-                                       bool state)
-{
-       if (fbdev_cma)
-

drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,

drivers/gpu/drm/drm_fb_cma_helper.c +0 -3
-                                                  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 +2 -19
@@ -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
(quoted diff) +0 -0

b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644

drivers/gpu/drm/rcar-du/rcar_du_drv.h +0 -1
@@ -78,7 +78,6 @@ struct rcar_du_device {
 
         struct drm_device *ddev;
         struct drm_fbdev_cma *fbdev;
 
-       struct drm_atomic_state *suspend_state;
 
         struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
         unsigned int num_crtcs;
(quoted diff) +0 -0

b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644

include/drm/drm_fb_cma_helper.h +0 -2
@@ -26,8 +26,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_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);

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#13 lore raw

Hi Daniel,

Quoted 9 lines · On Tuesday, 23 October 2018 16:40:41 EEST Daniel Vetter wrote:
Quoted 8 lines · Souptick Joarder
Quoted 7 lines · Daniel Vetter
Quoted 6 lines · Souptick Joarder
Quoted 5 lines · Noralf Trønnes

Den 01.10.2018 13.56, skrev Laurent Pinchart:

Quoted 4 lines · On Monday, 1 October 2018 09:52:20 EEST Daniel Vetter wrote:
Quoted 3 lines · Laurent Pinchart
Quoted 2 lines · On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote:
Quoted 1 line

On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder

Quoted 64 lines · wrote:
Quoted 64 lines
Quoted 64 lines
Quoted 63 lines
Quoted 53 lines
Quoted 33 lines
Quoted 29 lines
Quoted 20 lines
Quoted 20 lines
Quoted 7 lines · Souptick Joarder
Quoted 6 lines

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

remove suspend_state field from the rcar_du_device structure as it is no more required.

Quoted 7 lines
Quoted 5 lines

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

Laurent, any comment on this patch ??

Sorry for the delay, and thanks for pinging me.

Reviewed-by: Laurent Pinchart
<[email protected]>

Quoted 8 lines
Quoted 2 lines

Should I apply this to my tree or do you plan to merge it through drm-misc as it touches drm_fb_cma_helper.c ?

I just realized that the same patch got supplied by Noralf Trønnes nearly a year ago, and was later superseded by
https://patchwork.freedesktop.org/patch/247861/. I think we should thus apply Noralf's patches instead (once he sends v4 out).

Quoted 3 lines

I don't think Noralf is still actively working on this, he's busy with the fbdev emulation stuff. Probably better if you pick up one of the existing ones, than waiting another year or so :-)

Quoted 5 lines

Isn't https://patchwork.freedesktop.org/patch/247861/ part of the fbdev emulation stuff ? That patch series is from less than a month ago, so I thought it was actively developed.

Let's ask him. Noralf, any comment ? :-)

I see now that I've caused some confusion here.

I did some refactoring of the fbdev stuff in the CMA helper last year. In the last series of that work there is this patch:

[v3,07/11] drm/rcar-du: Use drm_mode_config_helper_suspend/resume()
https://patchwork.freedesktop.org/patch/192414/

During Christmas I got the idea that maybe it was possible to use a dumb buffer to do generic fbdev emulation. That work took me 6 months before a solution using a general internal DRM client was hammered out. By the time I started to convert drivers I had forgotten about that patch.

Quoted 8 lines

When I wrote the patch (#247861) to convert rcar to the generic fbdev, I just bundled up the suspend/resume change with the fbdev conversion. Laurent and Sam commented on that bundling, so I said that I would split it up in the next version.

All that being said, I think that this patch should be applied and I'll just rebase the rcar fbdev conversion patch on top of that. It's the easiest for me at least :-)

Any conclusion on this patch ? :-)

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Laurent should pick it up and apply to his rcar-du tree I think. We can also stuff it into drm-misc as a fallback.

Can we get this patch in queue for 4.20 ?

5.1, 4.20 is already done.

But yes, I pulled this into drm-misc-next. Thanks for your patch.

I would have preferred applying this through my tree. I'm currently at ELCE and had to prepare for the conference, hence the delay.

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
  drivers/gpu/drm/drm_fb_cma_helper.c   | 18 ------------------
  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++-----------------
  drivers/gpu/drm/rcar-du/rcar_du_drv.h |  1 -
  include/drm/drm_fb_cma_helper.h       |  2 --
  4 files changed, 2 insertions(+), 40 deletions(-)
Signature · 3 lines
Regards,

Laurent Pinchart