Skip to contentSkip to conversation

gpu/drm/exynos: Convert drm_atomic_helper_suspend/resume()

PATCH Superseded Souptick Joarder 2 participants 5 messages Aug 2, 2018 – Aug 4, 2018

Subsystems (3)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 gpu/drm/exynos: Convert drm_atomic_helper_suspend/resume()

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

exynos_drm_fbdev_suspend/resume can be removed as drm_mode_config_helper_suspend/resume has implement the same in generic way.

Remove suspend_state from exynos_drm_private struct as it is no more useful.

---
v2: Address Inki Dae's comment. Remove ret variable
from both suspend/resume function.

v3: Tested by Marek. Updated the change log.

 drivers/gpu/drm/exynos/exynos_drm_drv.c   | 26 ++------------------------
 drivers/gpu/drm/exynos/exynos_drm_drv.h   |  1 -
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 -----------------
 drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ----------
 4 files changed, 2 insertions(+), 52 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +2 -24
index b599f74..d86dd81 100644
@@ -149,37 +149,15 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
 static int exynos_drm_suspend(struct device *dev)
 {
 	struct drm_device *drm_dev = dev_get_drvdata(dev);
-	struct exynos_drm_private *private;
-
-	if (!drm_dev)
-		return 0;
-
-	private = drm_dev->dev_private;
-
-	drm_kms_helper_poll_disable(drm_dev);
-	exynos_drm_fbdev_suspend(drm_dev);
-	private->suspend_state = drm_atomic_helper_suspend(drm_dev);
-	if (IS_ERR(private->suspend_state)) {
-		exynos_drm_fbdev_resume(drm_dev);
-		drm_kms_helper_poll_enable(drm_dev);
-		return PTR_ERR(private->suspend_state);
-	}
 
-	return 0;
+	return  drm_mode_config_helper_suspend(drm_dev);
 }
 
 static void exynos_drm_resume(struct device *dev)
 {
 	struct drm_device *drm_dev = dev_get_drvdata(dev);
-	struct exynos_drm_private *private;
-
-	if (!drm_dev)
-		return;
 
-	private = drm_dev->dev_private;
-	drm_atomic_helper_resume(drm_dev, private->suspend_state);
-	exynos_drm_fbdev_resume(drm_dev);
-	drm_kms_helper_poll_enable(drm_dev);
+	return drm_mode_config_helper_resume(drm_dev);
 }
 
 static const struct dev_pm_ops exynos_drm_pm_ops = {
drivers/gpu/drm/exynos/exynos_drm_drv.h +0 -1
index c737c4b..7349e7c 100644
@@ -195,7 +195,6 @@ struct drm_exynos_file_private {
  */
 struct exynos_drm_private {
 	struct drm_fb_helper *fb_helper;
-	struct drm_atomic_state *suspend_state;
 
 	struct device *g2d_dev;
 	struct device *dma_dev;
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +0 -17
index 132dd52..918dd2c 100644
@@ -270,20 +270,3 @@ void exynos_drm_fbdev_fini(struct drm_device *dev)
 	private->fb_helper = NULL;
 }
 
-void exynos_drm_fbdev_suspend(struct drm_device *dev)
-{
-	struct exynos_drm_private *private = dev->dev_private;
-
-	console_lock();
-	drm_fb_helper_set_suspend(private->fb_helper, 1);
-	console_unlock();
-}
-
-void exynos_drm_fbdev_resume(struct drm_device *dev)
-{
-	struct exynos_drm_private *private = dev->dev_private;
-
-	console_lock();
-	drm_fb_helper_set_suspend(private->fb_helper, 0);
-	console_unlock();
-}
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -10
index b338472..6840b6a 100644
@@ -19,8 +19,6 @@
 
 int exynos_drm_fbdev_init(struct drm_device *dev);
 void exynos_drm_fbdev_fini(struct drm_device *dev);
-void exynos_drm_fbdev_suspend(struct drm_device *drm);
-void exynos_drm_fbdev_resume(struct drm_device *drm);
 
 #else
 
@@ -39,14 +37,6 @@ static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev)
 
 #define exynos_drm_output_poll_changed (NULL)
 
-static inline void exynos_drm_fbdev_suspend(struct drm_device *drm)
-{
-}
-
-static inline void exynos_drm_fbdev_resume(struct drm_device *drm)
-{
-}
-
 #endif
 
 #endif
Signature · 1 line
1.9.1
#1 lore raw

Hi,

Quoted 56 lines · Souptick Joarder

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

exynos_drm_fbdev_suspend/resume can be removed as drm_mode_config_helper_suspend/resume has implement the same in generic way.

Remove suspend_state from exynos_drm_private struct as it is no more useful.

---
v2: Address Inki Dae's comment. Remove ret variable
from both suspend/resume function.

v3: Tested by Marek. Updated the change log.

  drivers/gpu/drm/exynos/exynos_drm_drv.c   | 26 ++------------------------
  drivers/gpu/drm/exynos/exynos_drm_drv.h   |  1 -
  drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 -----------------
  drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ----------
  4 files changed, 2 insertions(+), 52 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -16
index b599f74..d86dd81 100644
@@ -149,37 +149,15 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
  static int exynos_drm_suspend(struct device *dev)
  {
  	struct drm_device *drm_dev = dev_get_drvdata(dev);
-	struct exynos_drm_private *private;
-
-	if (!drm_dev)
-		return 0;
-
-	private = drm_dev->dev_private;
-
-	drm_kms_helper_poll_disable(drm_dev);
-	exynos_drm_fbdev_suspend(drm_dev);
-	private->suspend_state = drm_atomic_helper_suspend(drm_dev);
-	if (IS_ERR(private->suspend_state)) {
-		exynos_drm_fbdev_resume(drm_dev);
-		drm_kms_helper_poll_enable(drm_dev);
-		return PTR_ERR(private->suspend_state);
-	}
 
-	return 0;
+	return  drm_mode_config_helper_suspend(drm_dev);
  }
 
  static void exynos_drm_resume(struct device *dev)
  {
  	struct drm_device *drm_dev = dev_get_drvdata(dev);

drivers/gpu/drm/exynos/exynos_drm_drv.c static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) · line 160

Quoted 10 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -8
-	struct exynos_drm_private *private;
-
-	if (!drm_dev)
-		return;
 
-	private = drm_dev->dev_private;
-	drm_atomic_helper_resume(drm_dev, private->suspend_state);
-	exynos_drm_fbdev_resume(drm_dev);
-	drm_kms_helper_poll_enable(drm_dev);
+	return drm_mode_config_helper_resume(drm_dev);

exynos_drm_resume() now returns 'void', so to be strict with c standard, the return statement should not be used here.

Quoted 58 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -0
  }
 
  static const struct dev_pm_ops exynos_drm_pm_ops = {
drivers/gpu/drm/exynos/exynos_drm_drv.h +0 -1
index c737c4b..7349e7c 100644
@@ -195,7 +195,6 @@ struct drm_exynos_file_private {
   */
  struct exynos_drm_private {
  	struct drm_fb_helper *fb_helper;
-	struct drm_atomic_state *suspend_state;
 
  	struct device *g2d_dev;
  	struct device *dma_dev;
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +0 -17
index 132dd52..918dd2c 100644
@@ -270,20 +270,3 @@ void exynos_drm_fbdev_fini(struct drm_device *dev)
  	private->fb_helper = NULL;
  }
 
-void exynos_drm_fbdev_suspend(struct drm_device *dev)
-{
-	struct exynos_drm_private *private = dev->dev_private;
-
-	console_lock();
-	drm_fb_helper_set_suspend(private->fb_helper, 1);
-	console_unlock();
-}
-
-void exynos_drm_fbdev_resume(struct drm_device *dev)
-{
-	struct exynos_drm_private *private = dev->dev_private;
-
-	console_lock();
-	drm_fb_helper_set_suspend(private->fb_helper, 0);
-	console_unlock();
-}
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -3
index b338472..6840b6a 100644
@@ -19,8 +19,6 @@
 
  int exynos_drm_fbdev_init(struct drm_device *dev);
  void exynos_drm_fbdev_fini(struct drm_device *dev);
-void exynos_drm_fbdev_suspend(struct drm_device *drm);
-void exynos_drm_fbdev_resume(struct drm_device *drm);
 
  #else
 
@@ -39,14 +37,6 @@ static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev)
 
  #define exynos_drm_output_poll_changed (NULL)
 
-static inline void exynos_drm_fbdev_suspend(struct drm_device *drm)

drivers/gpu/drm/exynos/exynos_drm_fbdev.h static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev) · line 42

Quoted 10 lines
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -7
-{
-}
-
-static inline void exynos_drm_fbdev_resume(struct drm_device *drm)
-{
-}
-
  #endif
 
  #endif

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
#2 lore raw
Quoted 64 lines · Marek Szyprowski

Hi,

Quoted 61 lines · Souptick Joarder

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

exynos_drm_fbdev_suspend/resume can be removed as drm_mode_config_helper_suspend/resume has implement the same in generic way.

Remove suspend_state from exynos_drm_private struct as it is no more useful.

---
v2: Address Inki Dae's comment. Remove ret variable
from both suspend/resume function.

v3: Tested by Marek. Updated the change log.

  drivers/gpu/drm/exynos/exynos_drm_drv.c   | 26 ++------------------------
  drivers/gpu/drm/exynos/exynos_drm_drv.h   |  1 -
  drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 -----------------
  drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ----------
  4 files changed, 2 insertions(+), 52 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -20
index b599f74..d86dd81 100644
@@ -149,37 +149,15 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
  static int exynos_drm_suspend(struct device *dev)
  {
      struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct exynos_drm_private *private;
-
-     if (!drm_dev)
-             return 0;
-
-     private = drm_dev->dev_private;
-
-     drm_kms_helper_poll_disable(drm_dev);
-     exynos_drm_fbdev_suspend(drm_dev);
-     private->suspend_state = drm_atomic_helper_suspend(drm_dev);
-     if (IS_ERR(private->suspend_state)) {
-             exynos_drm_fbdev_resume(drm_dev);
-             drm_kms_helper_poll_enable(drm_dev);
-             return PTR_ERR(private->suspend_state);
-     }
 
-     return 0;
+     return  drm_mode_config_helper_suspend(drm_dev);
  }
 
  static void exynos_drm_resume(struct device *dev)
  {
      struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct exynos_drm_private *private;
-
-     if (!drm_dev)
-             return;
 
Quoted 8 lines

drivers/gpu/drm/exynos/exynos_drm_drv.c static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) · line 160

Quoted 5 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -4
-     private = drm_dev->dev_private;
-     drm_atomic_helper_resume(drm_dev, private->suspend_state);
-     exynos_drm_fbdev_resume(drm_dev);
-     drm_kms_helper_poll_enable(drm_dev);
+     return drm_mode_config_helper_resume(drm_dev);

exynos_drm_resume() now returns 'void', so to be strict with c standard, the return statement should not be used here.

But in struct dev_pm_ops, it is still defined as

                int (*resume)(struct device *dev);

I think, we need to correct the return type of
exynos_drm_resume() to int.

Although I posted v4.

Quoted 75 lines
Quoted 59 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -0
  }
 
  static const struct dev_pm_ops exynos_drm_pm_ops = {
drivers/gpu/drm/exynos/exynos_drm_drv.h +0 -1
index c737c4b..7349e7c 100644
@@ -195,7 +195,6 @@ struct drm_exynos_file_private {
   */
  struct exynos_drm_private {
      struct drm_fb_helper *fb_helper;
-     struct drm_atomic_state *suspend_state;
 
      struct device *g2d_dev;
      struct device *dma_dev;
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +0 -17
index 132dd52..918dd2c 100644
@@ -270,20 +270,3 @@ void exynos_drm_fbdev_fini(struct drm_device *dev)
      private->fb_helper = NULL;
  }
 
-void exynos_drm_fbdev_suspend(struct drm_device *dev)
-{
-     struct exynos_drm_private *private = dev->dev_private;
-
-     console_lock();
-     drm_fb_helper_set_suspend(private->fb_helper, 1);
-     console_unlock();
-}
-
-void exynos_drm_fbdev_resume(struct drm_device *dev)
-{
-     struct exynos_drm_private *private = dev->dev_private;
-
-     console_lock();
-     drm_fb_helper_set_suspend(private->fb_helper, 0);
-     console_unlock();
-}
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -3
index b338472..6840b6a 100644
@@ -19,8 +19,6 @@
 
  int exynos_drm_fbdev_init(struct drm_device *dev);
  void exynos_drm_fbdev_fini(struct drm_device *dev);
-void exynos_drm_fbdev_suspend(struct drm_device *drm);
-void exynos_drm_fbdev_resume(struct drm_device *drm);
 
  #else
 
@@ -39,14 +37,6 @@ static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev)
 
  #define exynos_drm_output_poll_changed (NULL)
 
-static inline void exynos_drm_fbdev_suspend(struct drm_device *drm)

drivers/gpu/drm/exynos/exynos_drm_fbdev.h static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev) · line 42

Quoted 10 lines
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -7
-{
-}
-
-static inline void exynos_drm_fbdev_resume(struct drm_device *drm)
-{
-}
-
  #endif
 
  #endif

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland

#3 lore raw

Hi,

Quoted 71 lines · Souptick Joarder
Quoted 62 lines · Marek Szyprowski
Quoted 61 lines · Souptick Joarder

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

exynos_drm_fbdev_suspend/resume can be removed as drm_mode_config_helper_suspend/resume has implement the same in generic way.

Remove suspend_state from exynos_drm_private struct as it is no more useful.

---
v2: Address Inki Dae's comment. Remove ret variable
from both suspend/resume function.

v3: Tested by Marek. Updated the change log.

   drivers/gpu/drm/exynos/exynos_drm_drv.c   | 26 ++------------------------
   drivers/gpu/drm/exynos/exynos_drm_drv.h   |  1 -
   drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 -----------------
   drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ----------
   4 files changed, 2 insertions(+), 52 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -20
index b599f74..d86dd81 100644
@@ -149,37 +149,15 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
   static int exynos_drm_suspend(struct device *dev)
   {
       struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct exynos_drm_private *private;
-
-     if (!drm_dev)
-             return 0;
-
-     private = drm_dev->dev_private;
-
-     drm_kms_helper_poll_disable(drm_dev);
-     exynos_drm_fbdev_suspend(drm_dev);
-     private->suspend_state = drm_atomic_helper_suspend(drm_dev);
-     if (IS_ERR(private->suspend_state)) {
-             exynos_drm_fbdev_resume(drm_dev);
-             drm_kms_helper_poll_enable(drm_dev);
-             return PTR_ERR(private->suspend_state);
-     }
 
-     return 0;
+     return  drm_mode_config_helper_suspend(drm_dev);
   }
 
   static void exynos_drm_resume(struct device *dev)
   {
       struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct exynos_drm_private *private;
-
-     if (!drm_dev)
-             return;
 
Quoted 7 lines

drivers/gpu/drm/exynos/exynos_drm_drv.c static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) · line 160

Quoted 5 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -4
-     private = drm_dev->dev_private;
-     drm_atomic_helper_resume(drm_dev, private->suspend_state);
-     exynos_drm_fbdev_resume(drm_dev);
-     drm_kms_helper_poll_enable(drm_dev);
+     return drm_mode_config_helper_resume(drm_dev);

exynos_drm_resume() now returns 'void', so to be strict with c standard, the return statement should not be used here.

Quoted 6 lines

But in struct dev_pm_ops, it is still defined as

                 int (*resume)(struct device *dev);

I think, we need to correct the return type of
exynos_drm_resume() to int.

Nope. After commit dc684af6fc8d ("drm/exynos: Suspend/resume display pipeline as early/late as possible") exynos_drm_resume() is assigned to .complete callback, which use 'void' return type, so for now no more changes are needed.

Quoted 76 lines

Although I posted v4.

Quoted 67 lines
Quoted 67 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -0
   }
 
   static const struct dev_pm_ops exynos_drm_pm_ops = {
drivers/gpu/drm/exynos/exynos_drm_drv.h +0 -1
index c737c4b..7349e7c 100644
@@ -195,7 +195,6 @@ struct drm_exynos_file_private {
    */
   struct exynos_drm_private {
       struct drm_fb_helper *fb_helper;
-     struct drm_atomic_state *suspend_state;
 
       struct device *g2d_dev;
       struct device *dma_dev;
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +0 -17
index 132dd52..918dd2c 100644
@@ -270,20 +270,3 @@ void exynos_drm_fbdev_fini(struct drm_device *dev)
       private->fb_helper = NULL;
   }
 
-void exynos_drm_fbdev_suspend(struct drm_device *dev)
-{
-     struct exynos_drm_private *private = dev->dev_private;
-
-     console_lock();
-     drm_fb_helper_set_suspend(private->fb_helper, 1);
-     console_unlock();
-}
-
-void exynos_drm_fbdev_resume(struct drm_device *dev)
-{
-     struct exynos_drm_private *private = dev->dev_private;
-
-     console_lock();
-     drm_fb_helper_set_suspend(private->fb_helper, 0);
-     console_unlock();
-}
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -10
index b338472..6840b6a 100644
@@ -19,8 +19,6 @@
 
   int exynos_drm_fbdev_init(struct drm_device *dev);
   void exynos_drm_fbdev_fini(struct drm_device *dev);
-void exynos_drm_fbdev_suspend(struct drm_device *drm);
-void exynos_drm_fbdev_resume(struct drm_device *drm);
 
   #else
 
@@ -39,14 +37,6 @@ static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev)
 
   #define exynos_drm_output_poll_changed (NULL)
 
-static inline void exynos_drm_fbdev_suspend(struct drm_device *drm)
-{
-}
-
-static inline void exynos_drm_fbdev_resume(struct drm_device *drm)
-{
-}
-
   #endif
 
Quoted 6 lines

drivers/gpu/drm/exynos/exynos_drm_fbdev.h static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev) · line 42

Quoted 1 line
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -0
   #endif

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Quoted 6 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
#4 lore raw
Quoted 78 lines · Marek Szyprowski

Hi,

Quoted 75 lines · Souptick Joarder
Quoted 62 lines · Marek Szyprowski
Quoted 61 lines · Souptick Joarder

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

exynos_drm_fbdev_suspend/resume can be removed as drm_mode_config_helper_suspend/resume has implement the same in generic way.

Remove suspend_state from exynos_drm_private struct as it is no more useful.

---
v2: Address Inki Dae's comment. Remove ret variable
from both suspend/resume function.

v3: Tested by Marek. Updated the change log.

   drivers/gpu/drm/exynos/exynos_drm_drv.c   | 26 ++------------------------
   drivers/gpu/drm/exynos/exynos_drm_drv.h   |  1 -
   drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 -----------------
   drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ----------
   4 files changed, 2 insertions(+), 52 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -20
index b599f74..d86dd81 100644
@@ -149,37 +149,15 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
   static int exynos_drm_suspend(struct device *dev)
   {
       struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct exynos_drm_private *private;
-
-     if (!drm_dev)
-             return 0;
-
-     private = drm_dev->dev_private;
-
-     drm_kms_helper_poll_disable(drm_dev);
-     exynos_drm_fbdev_suspend(drm_dev);
-     private->suspend_state = drm_atomic_helper_suspend(drm_dev);
-     if (IS_ERR(private->suspend_state)) {
-             exynos_drm_fbdev_resume(drm_dev);
-             drm_kms_helper_poll_enable(drm_dev);
-             return PTR_ERR(private->suspend_state);
-     }
 
-     return 0;
+     return  drm_mode_config_helper_suspend(drm_dev);
   }
 
   static void exynos_drm_resume(struct device *dev)
   {
       struct drm_device *drm_dev = dev_get_drvdata(dev);
-     struct exynos_drm_private *private;
-
-     if (!drm_dev)
-             return;
 
Quoted 7 lines

drivers/gpu/drm/exynos/exynos_drm_drv.c static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) · line 160

Quoted 5 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -4
-     private = drm_dev->dev_private;
-     drm_atomic_helper_resume(drm_dev, private->suspend_state);
-     exynos_drm_fbdev_resume(drm_dev);
-     drm_kms_helper_poll_enable(drm_dev);
+     return drm_mode_config_helper_resume(drm_dev);

exynos_drm_resume() now returns 'void', so to be strict with c standard, the return statement should not be used here.

But in struct dev_pm_ops, it is still defined as

                 int (*resume)(struct device *dev);
Quoted 7 lines
Quoted 2 lines

I think, we need to correct the return type of
exynos_drm_resume() to int.

Nope. After commit dc684af6fc8d ("drm/exynos: Suspend/resume display pipeline as early/late as possible") exynos_drm_resume() is assigned to .complete callback, which use 'void' return type, so for now no more changes are needed.

Ok, then v4 is the right candidate to go.

Quoted 89 lines
Quoted 77 lines

Although I posted v4.

Quoted 67 lines
Quoted 67 lines
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -0
   }
 
   static const struct dev_pm_ops exynos_drm_pm_ops = {
drivers/gpu/drm/exynos/exynos_drm_drv.h +0 -1
index c737c4b..7349e7c 100644
@@ -195,7 +195,6 @@ struct drm_exynos_file_private {
    */
   struct exynos_drm_private {
       struct drm_fb_helper *fb_helper;
-     struct drm_atomic_state *suspend_state;
 
       struct device *g2d_dev;
       struct device *dma_dev;
drivers/gpu/drm/exynos/exynos_drm_fbdev.c +0 -17
index 132dd52..918dd2c 100644
@@ -270,20 +270,3 @@ void exynos_drm_fbdev_fini(struct drm_device *dev)
       private->fb_helper = NULL;
   }
 
-void exynos_drm_fbdev_suspend(struct drm_device *dev)
-{
-     struct exynos_drm_private *private = dev->dev_private;
-
-     console_lock();
-     drm_fb_helper_set_suspend(private->fb_helper, 1);
-     console_unlock();
-}
-
-void exynos_drm_fbdev_resume(struct drm_device *dev)
-{
-     struct exynos_drm_private *private = dev->dev_private;
-
-     console_lock();
-     drm_fb_helper_set_suspend(private->fb_helper, 0);
-     console_unlock();
-}
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -10
index b338472..6840b6a 100644
@@ -19,8 +19,6 @@
 
   int exynos_drm_fbdev_init(struct drm_device *dev);
   void exynos_drm_fbdev_fini(struct drm_device *dev);
-void exynos_drm_fbdev_suspend(struct drm_device *drm);
-void exynos_drm_fbdev_resume(struct drm_device *drm);
 
   #else
 
@@ -39,14 +37,6 @@ static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev)
 
   #define exynos_drm_output_poll_changed (NULL)
 
-static inline void exynos_drm_fbdev_suspend(struct drm_device *drm)
-{
-}
-
-static inline void exynos_drm_fbdev_resume(struct drm_device *drm)
-{
-}
-
   #endif
 
Quoted 6 lines

drivers/gpu/drm/exynos/exynos_drm_fbdev.h static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev) · line 42

Quoted 1 line
drivers/gpu/drm/exynos/exynos_drm_fbdev.h +0 -0
   #endif

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Quoted 6 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland