Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:03:05 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
i915: Omit needless ifdef and do call intel_bios_init.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.43 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.44
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.43 Sun Dec 19 11:56:52 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 12:03:05 2021
@@ -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 @@ static int i915_driver_modeset_probe(str
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);
