Re: [PATCH 4/6] drm/fsl-dcu: Use drm_mode_config_helper_suspend/resume()

[Noralf Trønnes]

Den 02.11.2017 21.09, skrev Noralf Trønnes:

These helpers take care of output polling, fbdev and atomic state.

Cc: Stefan Agner <ste...@agner.ch>
Cc: Alison Wang <alison.w...@freescale.com>
Signed-off-by: Noralf Trønnes <nor...@tronnes.org>
---
  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 23 +++++------------------
  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h |  1 -
  2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c 
b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index 58e9e0601a61..0738d9c6f1aa 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -27,6 +27,7 @@
  #include <drm/drm_crtc_helper.h>
  #include <drm/drm_fb_cma_helper.h>
  #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_modeset_helper.h>

#include "fsl_dcu_drm_crtc.h"

  #include "fsl_dcu_drm_drv.h"
@@ -193,21 +194,11 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
                return 0;

Somehow I missed that ret wasn't declared here.

    int ret;

Will fix in the next version.

Noralf.

        disable_irq(fsl_dev->irq);
-       drm_kms_helper_poll_disable(fsl_dev->drm);

- console_lock();

-       drm_fbdev_cma_set_suspend(fsl_dev->fbdev, 1);
-       console_unlock();
-
-       fsl_dev->state = drm_atomic_helper_suspend(fsl_dev->drm);
-       if (IS_ERR(fsl_dev->state)) {
-               console_lock();
-               drm_fbdev_cma_set_suspend(fsl_dev->fbdev, 0);
-               console_unlock();
-
-               drm_kms_helper_poll_enable(fsl_dev->drm);
+       ret = drm_mode_config_helper_suspend(fsl_dev->drm);
+       if (ret) {
                enable_irq(fsl_dev->irq);
-               return PTR_ERR(fsl_dev->state);
+               return ret;
        }

clk_disable_unprepare(fsl_dev->pix_clk);

@@ -233,13 +224,9 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
        if (fsl_dev->tcon)
                fsl_tcon_bypass_enable(fsl_dev->tcon);
        fsl_dcu_drm_init_planes(fsl_dev->drm);
-       drm_atomic_helper_resume(fsl_dev->drm, fsl_dev->state);

- console_lock();

-       drm_fbdev_cma_set_suspend(fsl_dev->fbdev, 0);
-       console_unlock();
+       drm_mode_config_helper_resume(fsl_dev->drm);

- drm_kms_helper_poll_enable(fsl_dev->drm);

        enable_irq(fsl_dev->irq);

return 0;

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h 
b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
index da9bfd432ca6..93bfb98012d4 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
@@ -196,7 +196,6 @@ struct fsl_dcu_drm_device {
        struct drm_encoder encoder;
        struct fsl_dcu_drm_connector connector;
        const struct fsl_dcu_soc_data *soc;
-       struct drm_atomic_state *state;
  };

int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev);

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel