= 1500509
Needs ReviewPublic
Actions

Authored by junchoon_dec.sakura.ne.jp on Sat, May 23, 2:06 PM.

Details

Reviewers

kbowling
danfe
ashafer
manu
dumbbell
lwhsu
siva

Group Reviewers

x11

Summary

Add new ports

graphics/nvidia-drm-612-kmod,
graphics/nvidia-drm-612-kmod-580 and
graphics/nvidia-drm-612-kmod-devel

and add conflicts to

graphics/nvidia-drm-{515|61|66|latest}-kmod{-580|-devel}

following the addition of graphics/drm-612-kmod.

While here, bump

graphics/nvidia-drm-latest-kmod,
graphics/nvidia-drm-latest-kmod-580 and
graphics/nvidia-drm-latest-kmod-devel

following the bump of graphics/drm-latest-kmod from 6.9 to 6.12.

Bump PORTREVISION of other graphics/nvidia-drm-*-kmod*
as of changes in CONFLICTS.

Match DRM driver version selection with graphics/drm-kmod.
Now 6.12 is default for OSVERSION >= 1500509 (stable/15, upcoming 15.1
and main) when installed using graphics/nvidia-drm-kmod{-580|-devel}
ports / pkgs.

PR: 295519

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

junchoon_dec.sakura.ne.jp created this revision.Sat, May 23, 2:06 PM

Herald added a subscriber: zeising. · View Herald TranscriptSat, May 23, 2:06 PM

junchoon_dec.sakura.ne.jp requested review of this revision.Sat, May 23, 2:06 PM

Updated patch to match DRM driver version selection with
graphics/drm-kmod.
Now 6.12 is default for OSVERSION >= 1500509 (stable/15,
upcoming 15.1 and main) when installed using
graphics/nvidia-drm-kmod{-580|-devel} ports / pkgs.

For the first time, my dual gpu laptop is working as advertised with this patch on 15.1-RC1. I can switch between desktop and vt, or leave the desktop entirely. This is wonderful.

graphics/nvidia-drm-612-kmod/pkg-message
1–8	Make complains that pkg-message is not in UCL format,

In D57206#1311019, @ziaee wrote:

For the first time, my dual gpu laptop is working as advertised with this patch on 15.1-RC1. I can switch between desktop and vt, or leave the desktop entirely. This is wonderful.

Ok, I spoke a /little/ too soon. I was able to get it to lock up upon attempted exit of desktop 2/20ish tries, but that's a lot better than before on 15.0 with 66 where it would lock up 19/20 times you try to exit the desktop.

Note: Xorg is still very laggy and unusable in PRIME (RTX A1000 + Alder Lake laptop) unless i write an xorg.conf.d snippet telling it to only use the IGPU, but this is not a regression.

junchoon_dec.sakura.ne.jp added inline comments.Sun, May 24, 11:51 AM

graphics/nvidia-drm-612-kmod/pkg-message
1–8	Should this be modified (it's old-school format from the time pkg-message is introduced)? I've just copied from graphics/nvidia-drm-latest-kmod and modified to match for 612. If this needs to be modified, all others (515, 61, 66, latest) should be modified, too. (Should 510 on 2026Q2 need modification, too?) So I think it should be a separate PR/review after this as part of wordsmith works.

In D57206#1311023, @ziaee wrote:

In D57206#1311019, @ziaee wrote:

For the first time, my dual gpu laptop is working as advertised with this patch on 15.1-RC1. I can switch between desktop and vt, or leave the desktop entirely. This is wonderful.

Ok, I spoke a /little/ too soon. I was able to get it to lock up upon attempted exit of desktop 2/20ish tries, but that's a lot better than before on 15.0 with 66 where it would lock up 19/20 times you try to exit the desktop.

Note: Xorg is still very laggy and unusable in PRIME (RTX A1000 + Alder Lake laptop) unless i write an xorg.conf.d snippet telling it to only use the IGPU, but this is not a regression.

Does installing x11/nvidia-xconfig, back up (if exists) /etc/X11/xorg.conf and run nvidia-xconfig and reading generated one give you some hints to pick? Its manpage would shows you a bunch of options.

Also, reading README via web (https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/595.71.05/README/index.html) or installed one (/usr/local/share/doc/NVIDIA_GLX-1.0/README) as part of x11/nvidia-driver could help.

Does installing x11/nvidia-xconfig, back up (if exists) /etc/X11/xorg.conf and run nvidia-xconfig and reading generated one give you some hints to pick? Its manpage would shows you a bunch of options.

No. The one generated by nvidia-xconfig leaves the system unresponsive with a black screen. You can see the different xorg-conf.d snippets I've tried writing here: https://people.freebsd.org/~ziaee/tmp/. But again, this is no worse than it was before. Although, I did test it in Fedora 44, and PRIME does work on this hardware. Curiously, while initially exiting a wayland session worked at first when I installed it, it is now back to it's old behavior of just hanging on exit.

In D57206#1311181, @ziaee wrote:

Does installing x11/nvidia-xconfig, back up (if exists) /etc/X11/xorg.conf and run nvidia-xconfig and reading generated one give you some hints to pick? Its manpage would shows you a bunch of options.

No. The one generated by nvidia-xconfig leaves the system unresponsive with a black screen. You can see the different xorg-conf.d snippets I've tried writing here: https://people.freebsd.org/~ziaee/tmp/. But again, this is no worse than it was before. Although, I did test it in Fedora 44, and PRIME does work on this hardware. Curiously, while initially exiting a wayland session worked at first when I installed it, it is now back to it's old behavior of just hanging on exit.

Maybe you hadn't supplied PRIME related option to nvidia-xconfig (no PRIME related parts seen in your 10-nvidia-xconfig-failed.conf), as it generates NVIDIA only config by default. And wouldn't need to use the whole config generated, but pick relevant part to separate config file may be OK.

Looking into your 10-outputclass-PRIME-failed.conf, both "intel" and "nvidia" has 'Option "PrimaryGPU" "yes"'.
Isn't it problematic that confuses X11?

Anyway, I'm using NVIDIA dGPU only configs (Minisforum MS-01 with RTX A400 and ThinkPad P52 with Quadro P1000 notebook. On both computers, iGPU is disabled via UEFI config and on MS-01 onboard display connectors are not used but DP on RTX A400) and don't have issues like yours. So maybe Optimus specific issue or mis-configuration.
I believe Austin should have far deeper insights and experiences than me with this.

FYI: at least partial successful report in this forums thread.

https://forums.freebsd.org/threads/when-to-use-drm-latest-kmod-aka-version-6-9.102642/

Discussions related with DRM6.12 starts from comment #4. Wayland seems to want software mouse cursor rather than silken mouse (HW cursor) on NVIDIA drivers. Not sure it's NVIDIA specific or not, though.