[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display Restore vga ifde...

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

details:   https://anonhg.NetBSD.org/src/rev/9351344f5558
branches:  trunk
changeset: 1028293:9351344f5558
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:25:07 2021 +0000

description:
Restore vga ifdefs lost in merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_vga.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 011e63d29fb1 -r 9351344f5558 sys/external/bsd/drm2/dist/drm/i915/display/intel_vga.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_vga.c   Sun Dec 19 10:25:00 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_vga.c   Sun Dec 19 10:25:07 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_vga.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $  */
+/*     $NetBSD: intel_vga.c,v 1.3 2021/12/19 10:25:07 riastradh Exp $  */
 
 // SPDX-License-Identifier: MIT
 /*
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_vga.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_vga.c,v 1.3 2021/12/19 10:25:07 riastradh Exp $");
 
 #include <linux/pci.h>
 #include <linux/vgaarb.h>
@@ -146,6 +146,7 @@
        return 0;
 }
 
+#ifndef __NetBSD__
 static unsigned int
 intel_vga_set_decode(void *cookie, bool enable_decode)
 {
@@ -159,9 +160,11 @@
        else
                return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
 }
+#endif /* __NetBSD__ */
 
 int intel_vga_register(struct drm_i915_private *i915)
 {
+#ifndef __NetBSD__
        struct pci_dev *pdev = i915->drm.pdev;
        int ret;
 
@@ -176,13 +179,16 @@
        ret = vga_client_register(pdev, i915, NULL, intel_vga_set_decode);
        if (ret && ret != -ENODEV)
                return ret;
+#endif
 
        return 0;
 }
 
 void intel_vga_unregister(struct drm_i915_private *i915)
 {
+#ifndef __NetBSD__
        struct pci_dev *pdev = i915->drm.pdev;
 
        vga_client_register(pdev, NULL, NULL, NULL);
+#endif /* __NetBSD__ */
 }