Switch to atomic helpers: drm_mode_config_helper_suspend/resume().
Signed-off-by: Gerd Hoffmann <[email protected]>
---
drivers/gpu/drm/bochs/bochs_drv.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index f3dd66ae99..08ba6029d2 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -103,11 +103,8 @@ static int bochs_pm_suspend(struct device *dev)
struct drm_device *drm_dev = pci_get_drvdata(pdev);
struct bochs_device *bochs = drm_dev->dev_private;
- drm_kms_helper_poll_disable(drm_dev);
-
drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 1);
-
- return 0;
+ return drm_mode_config_helper_suspend(drm_dev);
}
static int bochs_pm_resume(struct device *dev)
@@ -116,12 +113,8 @@ static int bochs_pm_resume(struct device *dev)
struct drm_device *drm_dev = pci_get_drvdata(pdev);
struct bochs_device *bochs = drm_dev->dev_private;
- drm_helper_resume_force_mode(drm_dev);
-
drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 0);
-
- drm_kms_helper_poll_enable(drm_dev);
- return 0;
+ return drm_mode_config_helper_resume(drm_dev);
}
#endif
--
2.9.3
On 1/11/19 7:37 AM, Gerd Hoffmann wrote:
> Switch to atomic helpers: drm_mode_config_helper_suspend/resume().
>
> Signed-off-by: Gerd Hoffmann <[email protected]>
Reviewed-by: Oleksandr Andrushchenko <[email protected]>
> ---
> drivers/gpu/drm/bochs/bochs_drv.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
> index f3dd66ae99..08ba6029d2 100644
> --- a/drivers/gpu/drm/bochs/bochs_drv.c
> +++ b/drivers/gpu/drm/bochs/bochs_drv.c
> @@ -103,11 +103,8 @@ static int bochs_pm_suspend(struct device *dev)
> struct drm_device *drm_dev = pci_get_drvdata(pdev);
> struct bochs_device *bochs = drm_dev->dev_private;
>
> - drm_kms_helper_poll_disable(drm_dev);
> -
> drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 1);
> -
> - return 0;
> + return drm_mode_config_helper_suspend(drm_dev);
> }
>
> static int bochs_pm_resume(struct device *dev)
> @@ -116,12 +113,8 @@ static int bochs_pm_resume(struct device *dev)
> struct drm_device *drm_dev = pci_get_drvdata(pdev);
> struct bochs_device *bochs = drm_dev->dev_private;
>
> - drm_helper_resume_force_mode(drm_dev);
> -
> drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 0);
> -
> - drm_kms_helper_poll_enable(drm_dev);
> - return 0;
> + return drm_mode_config_helper_resume(drm_dev);
> }
> #endif
>