From: Sascha Wildner <saw@online.de>
Date: Fri, 13 Sep 2013 21:58:26 +0000 (+0200)
Subject: Disable making i915kms compilable into the kernel.
X-Git-Tag: v3.7.0~394
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/86689d3d94df777c02db785df7b4cc6d2fac8ef8

Disable making i915kms compilable into the kernel.

Right now, on systems with supported cards, it would cause the screen
go black before Xorg is started.

In-discussion-with: ftigeot
---

diff --git a/sys/conf/files b/sys/conf/files
index 70d1792746..e6dbd8d40b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1935,32 +1935,33 @@ dev/drm/ttm/ttm_execbuf_util.c		optional drm
 dev/drm/ttm/ttm_memory.c		optional drm
 dev/drm/ttm/ttm_page_alloc.c		optional drm
 dev/drm/ttm/ttm_bo_vm.c			optional drm
-dev/drm/i915/i915_debug.c		optional i915drm drm
-dev/drm/i915/i915_dma.c			optional i915drm drm
-dev/drm/i915/i915_drv.c			optional i915drm drm
-dev/drm/i915/i915_gem.c			optional i915drm drm
-dev/drm/i915/i915_gem_execbuffer.c	optional i915drm drm
-dev/drm/i915/i915_gem_evict.c		optional i915drm drm
-dev/drm/i915/i915_gem_gtt.c		optional i915drm drm
-dev/drm/i915/i915_gem_tiling.c		optional i915drm drm
-dev/drm/i915/i915_irq.c			optional i915drm drm
-dev/drm/i915/i915_suspend.c		optional i915drm drm
-dev/drm/i915/intel_bios.c		optional i915drm drm
-dev/drm/i915/intel_crt.c		optional i915drm drm
-dev/drm/i915/intel_display.c		optional i915drm drm
-dev/drm/i915/intel_dp.c			optional i915drm drm
-dev/drm/i915/intel_fb.c			optional i915drm drm
-dev/drm/i915/intel_hdmi.c		optional i915drm drm
-dev/drm/i915/intel_iic.c		optional i915drm drm
-dev/drm/i915/intel_lvds.c		optional i915drm drm
-dev/drm/i915/intel_modes.c		optional i915drm drm
-dev/drm/i915/intel_opregion.c		optional i915drm drm
-dev/drm/i915/intel_overlay.c		optional i915drm drm
-dev/drm/i915/intel_panel.c		optional i915drm drm
-dev/drm/i915/intel_ringbuffer.c		optional i915drm drm
-dev/drm/i915/intel_sdvo.c		optional i915drm drm
-dev/drm/i915/intel_sprite.c		optional i915drm drm
-dev/drm/i915/intel_tv.c			optional i915drm drm
+# i915kmsdrm breaks VGA console, disabled by default
+#dev/drm/i915/i915_debug.c		optional i915kmsdrm drm
+#dev/drm/i915/i915_dma.c			optional i915kmsdrm drm
+#dev/drm/i915/i915_drv.c			optional i915kmsdrm drm
+#dev/drm/i915/i915_gem.c			optional i915kmsdrm drm
+#dev/drm/i915/i915_gem_execbuffer.c	optional i915kmsdrm drm
+#dev/drm/i915/i915_gem_evict.c		optional i915kmsdrm drm
+#dev/drm/i915/i915_gem_gtt.c		optional i915kmsdrm drm
+#dev/drm/i915/i915_gem_tiling.c		optional i915kmsdrm drm
+#dev/drm/i915/i915_irq.c			optional i915kmsdrm drm
+#dev/drm/i915/i915_suspend.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_bios.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_crt.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_display.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_dp.c			optional i915kmsdrm drm
+#dev/drm/i915/intel_fb.c			optional i915kmsdrm drm
+#dev/drm/i915/intel_hdmi.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_iic.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_lvds.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_modes.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_opregion.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_overlay.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_panel.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_ringbuffer.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_sdvo.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_sprite.c		optional i915kmsdrm drm
+#dev/drm/i915/intel_tv.c			optional i915kmsdrm drm
 dev/drm/mach64/mach64_dma.c		optional mach64drm drm
 dev/drm/mach64/mach64_drv.c		optional mach64drm drm
 dev/drm/mach64/mach64_irq.c		optional mach64drm drm
diff --git a/sys/config/LINT b/sys/config/LINT
index d4afd5193c..a3a83817c0 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -2328,7 +2328,7 @@ device		pmtimer		# adjust the system clock after resume
 
 # DRM options:
 # drm:		General DRM code
-# i915drm:	Intel i830, i845, i915, i945, i965, G33/35
+# i915kmsdrm:	Intel integrated GPUs, starting from the 830M family
 # mach64drm:	ATI Mach64 cards - Rage and 3D Rage series
 # mgadrm:	AGP Matrox G200, G400, G450, G550
 # r128drm:	ATI Rage 128 cards
@@ -2342,7 +2342,7 @@ device		pmtimer		# adjust the system clock after resume
 # DRM requires AGP in the kernel.
 
 device		drm
-device		"i915drm"
+#device		"i915kmsdrm"	# breaks VGA console, disabled by default
 device		"mach64drm"
 device		mgadrm
 device		"r128drm"
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index a3e01a1b4b..1acc448b3a 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -2157,7 +2157,7 @@ device		aibs		# ASUSTeK AI Booster (ACPI ASOC ATK0110)
 
 # DRM options:
 # drm:		General DRM code
-# i915drm:	Intel i830, i845, i915, i945, i965, G33/35
+# i915kmsdrm:	Intel integrated GPUs, starting from the 830M family
 # mach64drm:	ATI Mach64 cards - Rage and 3D Rage series
 # mgadrm:	AGP Matrox G200, G400, G450, G550
 # r128drm:	ATI Rage 128 cards
@@ -2171,7 +2171,7 @@ device		aibs		# ASUSTeK AI Booster (ACPI ASOC ATK0110)
 # DRM requires AGP in the kernel.
 
 device		drm
-device		"i915drm"
+#device		"i915kmsdrm"	# breaks VGA console, disabled by default
 device		"mach64drm"
 device		mgadrm
 device		"r128drm"