[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Omit needless ifde...

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

details:   https://anonhg.NetBSD.org/src/rev/048f04219023
branches:  trunk
changeset: 1028794:048f04219023
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:03:05 2021 +0000

description:
i915: Omit needless ifdef and do call intel_bios_init.

diffstat:

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

diffs (34 lines):

diff -r 41414c4f8164 -r 048f04219023 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 12:02:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 12:03:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.43 2021/12/19 11:56:52 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.44 2021/12/19 12:03:05 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.43 2021/12/19 11:56:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.44 2021/12/19 12:03:05 riastradh Exp $");
 
 #include <linux/acpi.h>
 #include <linux/device.h>
@@ -307,15 +307,11 @@
                        goto out;
        }
 
-#ifdef __NetBSD__              /* XXX vga */
-       __USE(i915);
-#else
        intel_bios_init(i915);
 
        ret = intel_vga_register(i915);
        if (ret)
                goto out;
-#endif
 
 #ifdef __NetBSD__
        intel_register_dsm_handler(i915);