Replace the custom suspend/resume handling by calls into drm_mode_config_helper_{suspend,resume}().
Signed-off-by: Geert Uytterhoeven <geert+rene...@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart+rene...@ideasonboard.com> --- v2: - Add Reviewed-by. --- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 13 ------------- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 2 -- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 13 +++---------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index 5c0575eed3ab6833..a176cd3e494ed2fd 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -287,19 +287,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) scrtc->started = false; } -void shmob_drm_crtc_suspend(struct shmob_drm_crtc *scrtc) -{ - shmob_drm_crtc_stop(scrtc); -} - -void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc) -{ - if (scrtc->dpms != DRM_MODE_DPMS_ON) - return; - - shmob_drm_crtc_start(scrtc); -} - static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc) { return container_of(crtc, struct shmob_drm_crtc, base); diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h index fe41e42d6cc55275..37380c815f1f5a08 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h @@ -40,8 +40,6 @@ struct shmob_drm_connector { int shmob_drm_crtc_create(struct shmob_drm_device *sdev); void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc); -void shmob_drm_crtc_suspend(struct shmob_drm_crtc *scrtc); -void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc); int shmob_drm_encoder_create(struct shmob_drm_device *sdev); int shmob_drm_connector_create(struct shmob_drm_device *sdev, diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index e4e88e66de5c3d3b..b7643884b49f0bc8 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -20,6 +20,7 @@ #include <drm/drm_drv.h> #include <drm/drm_fbdev_generic.h> #include <drm/drm_gem_dma_helper.h> +#include <drm/drm_modeset_helper.h> #include <drm/drm_module.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> @@ -115,22 +116,14 @@ static int shmob_drm_pm_suspend(struct device *dev) { struct shmob_drm_device *sdev = dev_get_drvdata(dev); - drm_kms_helper_poll_disable(&sdev->ddev); - shmob_drm_crtc_suspend(&sdev->crtc); - - return 0; + return drm_mode_config_helper_suspend(&sdev->ddev); } static int shmob_drm_pm_resume(struct device *dev) { struct shmob_drm_device *sdev = dev_get_drvdata(dev); - drm_modeset_lock_all(&sdev->ddev); - shmob_drm_crtc_resume(&sdev->crtc); - drm_modeset_unlock_all(&sdev->ddev); - - drm_kms_helper_poll_enable(&sdev->ddev); - return 0; + return drm_mode_config_helper_resume(&sdev->ddev); } static int shmob_drm_pm_runtime_suspend(struct device *dev) -- 2.34.1