intel graphics regression? between r332432 and r333982

I'm looking for help to make graphics work on Dell Precision 3520.

This did work in r332432:
 http://freebsd.1045724.x6.nabble.com/Dell-Precision-3520-laptop-help-with-dual-graphics-card-td6249818.html

I now updated to:

# uname -a
FreeBSD z.net 12.0-CURRENT FreeBSD 12.0-CURRENT #0 r333982: Thu May 24 21:24:22 BST 2018     root_at_z.net:/usr/obj/usr/src/amd64.amd64/sys/GENERIC  amd64

and I cannot get graphics anymore.
Some details:

# pciconf -lv | grep -A3 vga
vgapci1_at_pci0:0:2:0:     class=0x030000 card=0x07a91028 chip=0x191b8086 rev=0x06 hdr=0x00
    vendor     = 'Intel Corporation'
    device     = 'HD Graphics 530'
    class      = display
--
vgapci0_at_pci0:1:0:0:     class=0x030200 card=0x07a91028 chip=0x13b410de rev=0xa2 hdr=0x00
    vendor     = 'NVIDIA Corporation'
    device     = 'GM107GLM [Quadro M620 Mobile]'
    class      = display

Somebody in questions_at_ suggested
https://github.com/ahacking/freebsd-gpu-off
to disable one of the 2 devices.
Not sure if this worked as expected.
I now have:

# cat /usr/local/etc/gpu-off.conf
export methods="\_SB.PCI0.PEG0.PEGP._OFF"

I built graphics/drm-next-kmod
and added kld_list="/boot/modules/i915kms.ko"
to /etc/rc.conf.

However, on boot I see:

KLD drm.ko: depends on kernel - not available or version mismatch
linker_load_file: /boot/modules/drm.ko - unsupported file type
KLD i915kms.ko: depends on drmn - not available or version mismatch
linker_load_file: /boot/modules/i915kms.ko - unsupported file type

I can still load these modules manually:

root_at_z:~ # kldload drm
root_at_z:~ # kldload i915kms
info: [drm] Initialized drm 1.1.0 20060810
root_at_z:~ # kldstat
Id Refs Address            Size     Name
 1   44 0xffffffff80200000 23fad18  kernel
 2    1 0xffffffff825fc000 29bc8    if_iwm.ko
 3    1 0xffffffff82626000 1bb438   iwm8265fw.ko
 4    1 0xffffffff831fa000 be5c     geom_bde.ko
 6    1 0xffffffff83206000 210      acpi_call.ko
 7    1 0xffffffff83207000 2388     ums.ko
 8    1 0xffffffff8320a000 1780     uhid.ko
 9    1 0xffffffff8320c000 10c70    drm.ko
10    1 0xffffffff8321d000 7d0e0    i915kms.ko
11    1 0xffffffff8329b000 40eb0    drm2.ko
12    4 0xffffffff832dc000 1ef0     iicbus.ko
13    1 0xffffffff832de000 ec0      iic.ko
14    1 0xffffffff832df000 1570     iicbb.ko


Still, starting X I get in /var/log/Xorg.0.log

[   429.258] (EE) open /dev/dri/card0: No such file or directory

Give me a hint

Anton