[src/trunk]: src/sys/external/bsd/drm2 Attempt to hook up i915 suspend/resume...

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

details:   https://anonhg.NetBSD.org/src/rev/86845f505c1d
branches:  trunk
changeset: 835218:86845f505c1d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:57:12 2018 +0000

description:
Attempt to hook up i915 suspend/resume callbacks.

diffstat:

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

diffs (107 lines):

diff -r 5fb3a0b58b61 -r 86845f505c1d sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Mon Aug 27 07:56:59 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Mon Aug 27 07:57:12 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.12 2018/08/27 07:51:16 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.13 2018/08/27 07:57:12 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.12 2018/08/27 07:51:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.13 2018/08/27 07:57:12 riastradh Exp $");
 
 #include <linux/device.h>
 #include <linux/acpi.h>
@@ -633,7 +633,7 @@
 static int bxt_resume_prepare(struct drm_i915_private *dev_priv);
 
 
-static int i915_drm_suspend(struct drm_device *dev)
+int i915_drm_suspend(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        pci_power_t opregion_target_state;
@@ -770,7 +770,7 @@
        return i915_drm_suspend_late(dev, false);
 }
 
-static int i915_drm_resume(struct drm_device *dev)
+int i915_drm_resume(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
 
@@ -843,7 +843,7 @@
        return 0;
 }
 
-static int i915_drm_resume_early(struct drm_device *dev)
+int i915_drm_resume_early(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        int ret = 0;
diff -r 5fb3a0b58b61 -r 86845f505c1d sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 07:56:59 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 07:57:12 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.h,v 1.21 2018/08/27 07:26:43 riastradh Exp $  */
+/*     $NetBSD: i915_drv.h,v 1.22 2018/08/27 07:57:12 riastradh Exp $  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
@@ -2712,9 +2712,9 @@
 extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);
 extern int i915_resume_switcheroo(struct drm_device *dev);
 
-extern int i915_drm_freeze(struct drm_device *dev);
-extern int i915_drm_thaw_early(struct drm_device *dev);
-extern int i915_drm_thaw(struct drm_device *dev);
+extern int i915_drm_suspend(struct drm_device *dev);
+extern int i915_drm_resume_early(struct drm_device *dev);
+extern int i915_drm_resume(struct drm_device *dev);
 
 /* i915_params.c */
 struct i915_params {
diff -r 5fb3a0b58b61 -r 86845f505c1d sys/external/bsd/drm2/i915drm/i915_pci.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci.c  Mon Aug 27 07:56:59 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci.c  Mon Aug 27 07:57:12 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci.c,v 1.15 2014/07/24 22:13:23 riastradh Exp $  */
+/*     $NetBSD: i915_pci.c,v 1.16 2018/08/27 07:57:12 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.15 2014/07/24 22:13:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.16 2018/08/27 07:57:12 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
@@ -225,7 +225,7 @@
        if (dev == NULL)
                return true;
 
-       ret = i915_drm_freeze(dev);
+       ret = i915_drm_suspend(dev);
        if (ret)
                return false;
 
@@ -242,10 +242,10 @@
        if (dev == NULL)
                return true;
 
-       ret = i915_drm_thaw_early(dev);
+       ret = i915_drm_resume_early(dev);
        if (ret)
                return false;
-       ret = i915_drm_thaw(dev);
+       ret = i915_drm_resume(dev);
        if (ret)
                return false;