Module Name: src
Committed By: riastradh
Date: Thu Sep 22 14:37:38 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c i915_drv.h
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c
Log Message:
i915: Make sure to call i915_drm_prepare too on suspend.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.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.47 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.48
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.47 Tue Dec 21 11:44:18 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Thu Sep 22 14:37:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.47 2021/12/21 11:44:18 tnn Exp $ */
+/* $NetBSD: i915_drv.c,v 1.48 2022/09/22 14:37:38 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.47 2021/12/21 11:44:18 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.48 2022/09/22 14:37:38 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -1747,8 +1747,7 @@ static bool suspend_to_idle(struct drm_i
return false;
}
-#ifndef __NetBSD__ /* XXX runtime pm */
-static int i915_drm_prepare(struct drm_device *dev)
+int i915_drm_prepare(struct drm_device *dev)
{
struct drm_i915_private *i915 = to_i915(dev);
@@ -1762,7 +1761,6 @@ static int i915_drm_prepare(struct drm_d
return 0;
}
-#endif
int i915_drm_suspend(struct drm_device *dev)
{
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.47 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.48
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.47 Sun Feb 27 14:22:29 2022
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Thu Sep 22 14:37:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.h,v 1.47 2022/02/27 14:22:29 riastradh Exp $ */
+/* $NetBSD: i915_drv.h,v 1.48 2022/09/22 14:37:38 riastradh Exp $ */
/* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
*/
@@ -1826,6 +1826,7 @@ void i915_driver_remove(struct drm_i915_
int i915_drm_resume(struct drm_device *);
int i915_drm_resume_early(struct drm_device *);
+int i915_drm_prepare(struct drm_device *);
int i915_drm_suspend(struct drm_device *);
int i915_drm_suspend_late(struct drm_device *, bool);
Index: src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.12 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.13
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.12 Mon Jul 18 23:34:02 2022
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Thu Sep 22 14:37:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.12 2022/07/18 23:34:02 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.13 2022/09/22 14:37:38 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.12 2022/07/18 23:34:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.13 2022/09/22 14:37:38 riastradh Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -255,6 +255,9 @@ i915drmkms_suspend(device_t self, const
struct drm_device *const dev = sc->sc_drm_dev;
int ret;
+ ret = i915_drm_prepare(dev);
+ if (ret)
+ return false;
ret = i915_drm_suspend(dev);
if (ret)
return false;
