Can't load nvidia.ko on stable/12 after r564088 (440.100_1 -> 460.36)

[David Wolfskill]

This is on both my current laptop (Dell Precision M4800) and a new(er)
one (Dell Precision 7520); the current laptop's graphics card shows up
as:

vgapci0 at pci0:1:0:0:     class=0x030000 card=0x05cc1028 chip=0x11fc10de rev=0xa1 hdr=0x00
    vendor     = 'NVIDIA Corporation'
    device     = 'GK106GLM [Quadro K2100M]'
    class      = display
    subclass   = VGA

and the new(eR) one as:

vgapci0 at pci0:1:0:0:     class=0x030000 card=0x17b01028 chip=0x13b610de rev=0xa2 
hdr=0x00
    vendor     = 'NVIDIA Corporation'
    device     = 'GM107GLM [Quadro M1200 Mobile]'
    class      = display
    subclass   = VGA


while running stable/12 at n232662-e8eded55f23:

g1-55(12.2-S)[5] uname -aUK
FreeBSD g1-55.catwhisker.org 12.2-STABLE FreeBSD 12.2-STABLE #949 stable/12-n232662-e8eded55f23: Fri Feb  5 03:33:27 PST 2021     root at g1-55.catwhisker.org:/common/S1/obj/usr/src/amd64.amd64/sys/CANARY  amd64 1202505 1202505

dmesg reports:

link_elf_obj: symbol nvidia_driver_name undefined
linker_load_file: /boot/modules/nvidia.ko - unsupported file type
KLD nvidia-modeset.ko: depends on nvidia - not available or version mismatch
linker_load_file: /boot/modules/nvidia-modeset.ko - unsupported file type

for each.

So I suspect that "link_elf_obj: symbol nvidia_driver_name undefined"
whine is likely salient.

As a circumvention:
cd /usr/ports/x11/nvidia-driver && \
sudo svn merge -c -r564088 . && \
sudo portmaster x11/nvidia-driver

worked for me (well, for the current laptop; I left the newer laptop
broken, as I only ssh into it, as its built-in mouse doesn't seem
to work with FreeBSD, nor does its wireless card (yet)).

Peace,
david
-- 
David H. Wolfskill                              david at catwhisker.org
Donald Trump held the office of President of the US as he incited his Putsch.

See https://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20210205/9e61db78/attachment.sig>