Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:57:12 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:
Attempt to hook up i915 suspend/resume callbacks.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.15 -r1.16 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.12 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.12 Mon Aug 27 07:51:16 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Mon Aug 27 07:57:12 2018
@@ -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 skl_resume_prepare(struct drm
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 @@ int i915_suspend_switcheroo(struct drm_d
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 @@ static int i915_drm_resume(struct drm_de
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;
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.21 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.22
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.21 Mon Aug 27 07:26:43 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Mon Aug 27 07:57:12 2018
@@ -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_max_ioctl;
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 {
Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.15 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.16
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.15 Thu Jul 24 22:13:23 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Mon Aug 27 07:57:12 2018
@@ -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 @@ i915drmkms_suspend(device_t self, const
if (dev == NULL)
return true;
- ret = i915_drm_freeze(dev);
+ ret = i915_drm_suspend(dev);
if (ret)
return false;
@@ -242,10 +242,10 @@ i915drmkms_resume(device_t self, const p
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;
