Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:18:00 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
restore lost ifdef of vga_switcheroo code
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.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.30 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.31
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.30 Sun Dec 19 11:17:52 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:18:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.30 2021/12/19 11:17:52 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.31 2021/12/19 11:18:00 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.30 2021/12/19 11:17:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.31 2021/12/19 11:18:00 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -1690,7 +1690,9 @@ static int i915_driver_open(struct drm_d
static void i915_driver_lastclose(struct drm_device *dev)
{
intel_fbdev_restore_mode(dev);
+#ifndef __NetBSD__ /* XXX vga */
vga_switcheroo_process_delayed_switch();
+#endif
}
static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
