[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 restore lost ifdef of vg...

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

details:   https://anonhg.NetBSD.org/src/rev/ff617bfd5e02
branches:  trunk
changeset: 1028548:ff617bfd5e02
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:18:00 2021 +0000

description:
restore lost ifdef of vga_switcheroo code


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 2c119064d0c8 -r ff617bfd5e02 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:17:52 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:18:00 2021 +0000
@@ -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 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)