[src/trunk]: src/sys/external/bsd/drm2 Call i915_drm_suspend_late too.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8eae4284fb76
branches:  trunk
changeset: 835403:8eae4284fb76
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 14:49:22 2018 +0000

description:
Call i915_drm_suspend_late too.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  6 +++---
 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h |  3 ++-
 sys/external/bsd/drm2/i915drm/i915_pci.c       |  7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r e29414d94bf6 -r 8eae4284fb76 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Mon Aug 27 14:49:05 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Mon Aug 27 14:49:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.13 2018/08/27 07:57:12 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.14 2018/08/27 14:49:22 riastradh Exp $  */
 
 /* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
  */
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.13 2018/08/27 07:57:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.14 2018/08/27 14:49:22 riastradh Exp $");
 
 #include <linux/device.h>
 #include <linux/acpi.h>
@@ -712,7 +712,7 @@
        return 0;
 }
 
-static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)
+int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)
 {
        struct drm_i915_private *dev_priv = drm_dev->dev_private;
        int ret;
diff -r e29414d94bf6 -r 8eae4284fb76 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 14:49:05 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 14:49:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.h,v 1.24 2018/08/27 14:47:02 riastradh Exp $  */
+/*     $NetBSD: i915_drv.h,v 1.25 2018/08/27 14:49:22 riastradh Exp $  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
@@ -2718,6 +2718,7 @@
 extern int i915_resume_switcheroo(struct drm_device *dev);
 
 extern int i915_drm_suspend(struct drm_device *dev);
+extern int i915_drm_suspend_late(struct drm_device *dev, bool hibernation);
 extern int i915_drm_resume_early(struct drm_device *dev);
 extern int i915_drm_resume(struct drm_device *dev);
 
diff -r e29414d94bf6 -r 8eae4284fb76 sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c  Mon Aug 27 14:49:05 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c  Mon Aug 27 14:49:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci.c,v 1.20 2018/08/27 14:12:14 riastradh Exp $  */
+/*     $NetBSD: i915_pci.c,v 1.21 2018/08/27 14:49:22 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.20 2018/08/27 14:12:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.21 2018/08/27 14:49:22 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
@@ -249,6 +249,9 @@
        ret = i915_drm_suspend(dev);
        if (ret)
                return false;
+       ret = i915_drm_suspend_late(dev, false);
+       if (ret)
+               return false;
 
        return true;
 }