On Tue, Mar 4, 2014 at 11:45:33 +0000, Robert Millan wrote: > Package: xserver-xorg-video-intel > Version: 2.21.15 > Tags: patch > User: [email protected] > Usertags: kfreebsd > > On 04/03/2014 10:43, Christoph Egger wrote: > > Robert Millan <[email protected]> writes: > >> With latest kfreebsd-11 manual "kldload drm2" shouldn't be required > >> anymore, just > >> "kldload i915kms". Does this work for you too? > > > > Is there a recomended way to do that automatically? I have had i915kms > > loaded from /etc/modules for a long time now and it works well on my > > kfreebsd-10. However when I boot into kfreebsd-11 it seems to load > > i915.ko. Unloading i915 and loading i915kms later on works fine and I > > get a nice newcons and proper X after that but I'd like to have it > > activated on boot! > > The intel driver is supposed to load the KMS version of the module (i915kms) > instead of > the non-KMS one (i915). > > Attached patch should fix this. > > (please CC the bug number if you followup) > > -- > Robert Millan
> diff -ur xserver-xorg-video-intel-2.21.15.old/src/intel_device.c
> xserver-xorg-video-intel-2.21.15/src/intel_device.c
> --- xserver-xorg-video-intel-2.21.15.old/src/intel_device.c 2013-08-21
> 13:20:29.000000000 +0200
> +++ xserver-xorg-video-intel-2.21.15/src/intel_device.c 2014-03-04
> 12:41:21.998263738 +0100
> @@ -135,7 +135,11 @@
>
> ret = drmCheckModesettingSupported(id);
> if (ret) {
> +#ifdef __FreeBSD_kernel__
> + if (xf86LoadKernelModule("i915kms"))
> +#else
> if (xf86LoadKernelModule("i915"))
> +#endif
> ret = drmCheckModesettingSupported(id);
> if (ret)
> return -1;
shouldn't that be #if defined(__FreeBSD_kernel__) ||
defined(__FreeBSD__)? Or does regular freebsd use i915 as module name?
Cheers,
Julien
signature.asc
Description: Digital signature
