Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:49:22 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c i915_drv.h
src/sys/external/bsd/drm2/i915drm: i915_pci.c
Log Message:
Call i915_drm_suspend_late too.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/i915drm/i915_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.13 Mon Aug 27 07:57:12 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Mon Aug 27 14:49:22 2018
@@ -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 @@ int i915_drm_suspend(struct drm_device *
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;
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.24 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.25
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.24 Mon Aug 27 14:47:02 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Mon Aug 27 14:49:22 2018
@@ -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_suspend_switcheroo(struc
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);
Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.20 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.21
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.20 Mon Aug 27 14:12:14 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Mon Aug 27 14:49:22 2018
@@ -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 @@ i915drmkms_suspend(device_t self, const
ret = i915_drm_suspend(dev);
if (ret)
return false;
+ ret = i915_drm_suspend_late(dev, false);
+ if (ret)
+ return false;
return true;
}
