Mark Kettenis <[email protected]> writes:

>> From: [email protected] (Timo =?utf-8?Q?Myyr=C3=A4?=)
>> 
>> Mark Kettenis <[email protected]> writes:
>> 
>> > Does the diff below help?
>> 
>> Nope,
>> After re-enabling the Intel GPU from BIOS and booting new kernel I got kernel
>> panic. Uploaded pics about the panic at:
>> http://devio.us/~zmyrgel/kernel_panic1.png
>> http://devio.us/~zmyrgel/kernel_panic2.png
>
> Can you try the diff below in addition to the previous diff?
>
> Thanks,
>
> Mark
>
>
> Index: i915_drv.c
> ===================================================================
> RCS file: /home/cvs/src/sys/dev/pci/drm/i915/i915_drv.c,v
> retrieving revision 1.98
> diff -u -p -r1.98 i915_drv.c
> --- i915_drv.c        22 Nov 2015 15:35:49 -0000      1.98
> +++ i915_drv.c        30 Dec 2015 21:41:32 -0000
> @@ -1115,8 +1115,8 @@ inteldrm_show_screen(void *v, void *cook
>  
>       dev_priv->switchcb = cb;
>       dev_priv->switchcbarg = cbarg;
> +     dev_priv->switchcookie = cookie;
>       if (cb) {
> -             dev_priv->switchcookie = cookie;
>               task_add(systq, &dev_priv->switchtask);
>               return (EAGAIN);
>       }


Applying this diff fixes the display but curiously breaks my USB keyboard.
The keyboard ceases to work after bootloader. USB mouse works just fine though.
If I disable inteldrm on boot the keyboard works fine.

Timo

Reply via email to