Bug#731144: kfreebsd: drm2 and i915kms kernel modules are not loaded automatically

[Robert Millan <rmh@debian.org>]

On 02/12/2013 14:09, Markus Koschany wrote:
> Package: kfreebsd-image-9.2-1-amd64
> Version: 9.2-1
> Severity: normal
> 
> Dear maintainer,
> 
> I have successfully installed kfreebsd-amd64 on my Lenovo Thinkpad
> X200. This laptop ships an Intel GM45 chipset. Unfortunately the
> graphic system falls back to Gallium 0.4 on llvmpipe instead of using
> the intel drivers for hardware acceleration. If I install the
> xserver-xorg-video-intel and libgl1-mesa-dri package the i915 kernel
> module is loaded but in fact I had to manually add drm2 and i915kms to
> /etc/modules and to unload i915 to benefit from the features of the intel driver.
> kfreebsd-10 and kfreebsd-11 currently show no improvements.

Hi Markus,

I believe the attached patch should fix this, provided that your kernel is
not affected by #684595 (i.e. use kfreebsd-11 or kfreebsd-downloader).

Please can you confirm?

-- 
Robert Millan

diff -ur xserver-xorg-video-intel-2.21.15/src/intel_device.c xserver-xorg-video-intel-2.21.15.new/src/intel_device.c
--- xserver-xorg-video-intel-2.21.15/src/intel_device.c	2013-08-21 13:20:29.000000000 +0200
+++ xserver-xorg-video-intel-2.21.15.new/src/intel_device.c	2013-12-18 23:47:58.213329263 +0100
@@ -135,7 +135,13 @@
 
 		ret = drmCheckModesettingSupported(id);
 		if (ret) {
-			if (xf86LoadKernelModule("i915"))
+			if (xf86LoadKernelModule(
+#ifdef __FreeBSD_kernel__
+						 "i915kms"
+#else
+						 "i915"
+#endif
+						 ))
 				ret = drmCheckModesettingSupported(id);
 			if (ret)
 				return -1;