-
Notifications
You must be signed in to change notification settings - Fork 731
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
x11/nvidia-driver: Fix bug that switching to the terminal wasn't poss…
…ible Tested with NVidia RTX 2060 on FreeBSD 13.1 STABLE. PR: 213912 Approved by: danfe@ (maintainer's timeout; 18 days)
- Loading branch information
Showing
3 changed files
with
45 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
- vbe framebuffer mode adjustment that enables switch back and forth to the black terminal | ||
- from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213912#c17 | ||
|
||
--- src/nvidia/nvidia_os.c.orig 2022-12-27 22:31:44 UTC | ||
+++ src/nvidia/nvidia_os.c | ||
@@ -789,6 +789,28 @@ void NV_API_CALL os_get_screen_info( | ||
*pFbPitch = efifb->fb_stride * (bpp / NBBY); | ||
return; | ||
} | ||
+ | ||
+ const struct vbe_fb *vbefb = | ||
+ (const struct vbe_fb *)preload_search_info(kmdp, MODINFO_METADATA | | ||
+ MODINFOMD_VBE_FB); | ||
+ | ||
+ /* Make sure base address is mapped to GPU BAR */ | ||
+ if ((vbefb != NULL) && | ||
+ ((vbefb->fb_addr == consoleBar1Address) || | ||
+ (vbefb->fb_addr == consoleBar2Address))) | ||
+ { | ||
+ int depth = fls(vbefb->fb_mask_red | vbefb->fb_mask_green | | ||
+ vbefb->fb_mask_blue | vbefb->fb_mask_reserved); | ||
+ int bpp = roundup2(depth, NBBY); | ||
+ | ||
+ *pPhysicalAddress = vbefb->fb_addr; | ||
+ *pFbWidth = vbefb->fb_width; | ||
+ *pFbHeight = vbefb->fb_height; | ||
+ *pFbDepth = depth; | ||
+ /* fb_stride is in pixels. Convert to bytes */ | ||
+ *pFbPitch = vbefb->fb_stride * (bpp / NBBY); | ||
+ return; | ||
+ } | ||
} | ||
{ | ||
const sc_softc_t *sc = sc_get_softc(0, SC_KERNEL_CONSOLE); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
[ | ||
{ type: install | ||
message: <<EOM | ||
Please add the line | ||
vbe_max_resolution="720p" | ||
to /boot/loader.conf to put vt into the vbe framebuffer mode that would | ||
allow terminals to work simultaneously with graphics. | ||
EOM | ||
} | ||
] |