diff options
author | Souptick Joarder <jrdr.linux@gmail.com> | 2018-08-08 12:16:41 -0400 |
---|---|---|
committer | Jyri Sarha <jsarha@ti.com> | 2018-10-01 08:52:29 -0400 |
commit | 4fdce78ab90173191fa9f472b47b9cbdacbc3edd (patch) | |
tree | 647292be0139e786d2d46a1f0cb99dcf01de9c51 | |
parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) |
drm/tilcdc: Convert drm_atomic_helper_suspend/resume()
convert drm_atomic_helper_suspend/resume() to use
drm_mode_config_helper_suspend/resume().
saved_state in tilcdc_drm_private will not be used
anymore, so it can be removed.
Signed-off-by: Ajit Negi <ajitn.linux@gmail.com>
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Tested-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
-rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 14 | ||||
-rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.h | 3 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 0fb300d41a09..33e533268488 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c | |||
@@ -554,29 +554,23 @@ static struct drm_driver tilcdc_driver = { | |||
554 | static int tilcdc_pm_suspend(struct device *dev) | 554 | static int tilcdc_pm_suspend(struct device *dev) |
555 | { | 555 | { |
556 | struct drm_device *ddev = dev_get_drvdata(dev); | 556 | struct drm_device *ddev = dev_get_drvdata(dev); |
557 | struct tilcdc_drm_private *priv = ddev->dev_private; | 557 | int ret = 0; |
558 | 558 | ||
559 | priv->saved_state = drm_atomic_helper_suspend(ddev); | 559 | ret = drm_mode_config_helper_suspend(ddev); |
560 | 560 | ||
561 | /* Select sleep pin state */ | 561 | /* Select sleep pin state */ |
562 | pinctrl_pm_select_sleep_state(dev); | 562 | pinctrl_pm_select_sleep_state(dev); |
563 | 563 | ||
564 | return 0; | 564 | return ret; |
565 | } | 565 | } |
566 | 566 | ||
567 | static int tilcdc_pm_resume(struct device *dev) | 567 | static int tilcdc_pm_resume(struct device *dev) |
568 | { | 568 | { |
569 | struct drm_device *ddev = dev_get_drvdata(dev); | 569 | struct drm_device *ddev = dev_get_drvdata(dev); |
570 | struct tilcdc_drm_private *priv = ddev->dev_private; | ||
571 | int ret = 0; | ||
572 | 570 | ||
573 | /* Select default pin state */ | 571 | /* Select default pin state */ |
574 | pinctrl_pm_select_default_state(dev); | 572 | pinctrl_pm_select_default_state(dev); |
575 | 573 | return drm_mode_config_helper_resume(ddev); | |
576 | if (priv->saved_state) | ||
577 | ret = drm_atomic_helper_resume(ddev, priv->saved_state); | ||
578 | |||
579 | return ret; | ||
580 | } | 574 | } |
581 | #endif | 575 | #endif |
582 | 576 | ||
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h index ead512216669..62cea5ff5558 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h | |||
@@ -70,9 +70,6 @@ struct tilcdc_drm_private { | |||
70 | const uint32_t *pixelformats; | 70 | const uint32_t *pixelformats; |
71 | uint32_t num_pixelformats; | 71 | uint32_t num_pixelformats; |
72 | 72 | ||
73 | /* The context for pm susped/resume cycle is stored here */ | ||
74 | struct drm_atomic_state *saved_state; | ||
75 | |||
76 | #ifdef CONFIG_CPU_FREQ | 73 | #ifdef CONFIG_CPU_FREQ |
77 | struct notifier_block freq_transition; | 74 | struct notifier_block freq_transition; |
78 | #endif | 75 | #endif |