[Openchrome-devel] drm-openchrome: Branch 'drm-next-3.19' - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/via_drv.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 8975599bec6f8c60c07043a47566f3986a00fa0e
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Oct 15 16:55:24 2017 -0700

    Replacing drm_fb_helper_set_suspend with fb_set_suspend
    
    drm_fb_helper_set_suspend is not available in this version, so
    substitute it with fb_set_suspend.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_drv.c b/drivers/gpu/drm/openchrome/via_drv.c
index 0492aa4d617b..d02e76bb6d89 100644
--- a/drivers/gpu/drm/openchrome/via_drv.c
+++ b/drivers/gpu/drm/openchrome/via_drv.c
@@ -467,7 +467,10 @@ static int via_pm_ops_suspend(struct device *dev)
 	DRM_DEBUG_KMS("Entered %s.", __func__);
 
 	console_lock();
-	drm_fb_helper_set_suspend(&dev_priv->via_fbdev->helper, true);
+	if (dev_priv->via_fbdev->helper.fbdev) {
+		fb_set_suspend(dev_priv->via_fbdev->helper.fbdev,
+				true);
+	}
 
 	/* 3X5.3B through 3X5.3F are scratch pad registers.
 	 * They are important for FP detection.
@@ -506,7 +509,11 @@ static int via_pm_ops_resume(struct device *dev)
 	vga_wcrt(VGABASE, 0x3f, dev_priv->saved_cr3f);
 
 	drm_helper_resume_force_mode(drm_dev);
-	drm_fb_helper_set_suspend(&dev_priv->via_fbdev->helper, false);
+	if (dev_priv->via_fbdev->helper.fbdev) {
+		fb_set_suspend(dev_priv->via_fbdev->helper.fbdev,
+				false);
+	}
+
 	console_unlock();
 
 	DRM_DEBUG_KMS("Exiting %s.\n", __func__);