Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nvidia fixes for scanout gbm allocation #27

Merged
merged 2 commits into from
Jul 24, 2024
Merged

Nvidia fixes for scanout gbm allocation #27

merged 2 commits into from
Jul 24, 2024

Conversation

vaxerski
Copy link
Member

@vaxerski vaxerski commented Jul 24, 2024

Nvidia cannot render to linear buffers part 2 the sequel

ref #26
ref hyprwm/Hyprland#7005

needs testing

@Agent00Ming
Copy link

Agent00Ming commented Jul 24, 2024

hyprwm/Hyprland@72bce7e can't build against this branch because FormatUtils.hpp isn't included with the other headers and it isn't used with relative path(?)

aq (fix-nv) patch used to get Hyprland to compile: include.txt

crash on some keybind bt.txt disregard. hyprwm/Hyprland#7025

@vaxerski
Copy link
Member Author

uhhh ci succeeds...

Also I still need confirmation whether this works

@Agent00Ming
Copy link

The monitor connected through thunderbolt/usb-c to displayport does indeed get video output on this branch (where it doesn't on main 4c72cd4)

@Agent00Ming
Copy link

I don't think CI checks for building Hyprland off of this branch of aq

[61/185] Building CXX object CMakeFiles/Hyprland.dir/src/protocols/DRMLease.cpp.o
FAILED: CMakeFiles/Hyprland.dir/src/protocols/DRMLease.cpp.o 
/usr/bin/c++ -DHAS_EXECINFO -DHYPRLAND_DEBUG -DHyprland_EXPORTS -DUSES_SYSTEMD -I/home/ming/documents/git/hyprland/. -I/home/ming/documents/git/hyprland/src -I/home/ming/documents/git/hyprland/subprojects/udis86 -I/home/ming/documents/git/hyprland/protocols -I/home/ming/documents/git/hyprland/subprojects/udis86/libudis86 -isystem /usr/include/uuid -isystem /usr/include/pango-1.0 -isystem /usr/include/cairo -isystem /usr/include/glib-2.0 -isystem /usr/lib/glib-2.0/include -isystem /usr/include/harfbuzz -isystem /usr/include/freetype2 -isystem /usr/include/pixman-1 -isystem /usr/include/libdrm -isystem /usr/include/libpng16 -isystem /usr/include/libmount -isystem /usr/include/blkid -isystem /usr/include/fribidi -isystem /usr/include/sysprof-6 -g -std=gnu++23 -Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing -Wno-pointer-arith -fmacro-prefix-map=/home/ming/documents/git/hyprland/= -pthread -Winvalid-pch -include /home/ming/documents/git/hyprland/build/CMakeFiles/Hyprland.dir/cmake_pch.hxx -MD -MT CMakeFiles/Hyprland.dir/src/protocols/DRMLease.cpp.o -MF CMakeFiles/Hyprland.dir/src/protocols/DRMLease.cpp.o.d -o CMakeFiles/Hyprland.dir/src/protocols/DRMLease.cpp.o -c /home/ming/documents/git/hyprland/src/protocols/DRMLease.cpp
In file included from /home/ming/documents/git/hyprland/src/protocols/DRMLease.cpp:3:
/usr/include/aquamarine/backend/DRM.hpp:10:10: fatal error: FormatUtils.hpp: No such file or directory
   10 | #include "FormatUtils.hpp"
      |          ^~~~~~~~~~~~~~~~~
compilation terminated.

@vaxerski
Copy link
Member Author

@fufexan fix

@vaxerski
Copy link
Member Author

fixed

@vaxerski
Copy link
Member Author

@fufexan fix ci

@fufexan
Copy link
Member

fufexan commented Jul 24, 2024

not failing tho?

@vaxerski
Copy link
Member Author

#27 (comment)

@fufexan
Copy link
Member

fufexan commented Jul 24, 2024

So you want me to create a new workflow that builds hl main with current-rev aq?

@vaxerski
Copy link
Member Author

vaxerski commented Jul 24, 2024

on pr yes just liuke hl

no wait

@vaxerski
Copy link
Member Author

the issue is the CI passed even tho the code from this branch wasnt compiling, so its not building this PR

@fufexan
Copy link
Member

fufexan commented Jul 24, 2024

CI isn't lying, I've just built this on WSL.

[nixos@nixos:~]$ nix build github:hyprwm/aquamarine/fix-nv -L --extra-experimental-features 'nix-command flakes' --print-out-paths
/nix/store/xiaclrn5cggrmqbpb14afybi5ci7mi8r-aquamarine-0.1.0+date=2024-07-24_c63080e

@vaxerski
Copy link
Member Author

jfc

last commit is fixed, you wont build dd8f312 though and it has a tick

@Agent00Ming
Copy link

this works for single nvidia gpu outputting through thunderbolt/usb-c to displayport, multigpu also works but this revealed that hotplug doesn't work for multigpu intel+nvidia (not a regression in this branch, it exists in main too)

@vaxerski
Copy link
Member Author

ok mergging thennnn

@vaxerski vaxerski merged commit 07eb70a into main Jul 24, 2024
2 checks passed
@darkwater
Copy link

This breaks rendering on AMD graphics, I get a black screen

@vaxerski
Copy link
Member Author

trace log please

@vaxerski
Copy link
Member Author

@darkwater should be fixed in latest please check

@darkwater
Copy link

darkwater commented Jul 24, 2024

Nope, still broken

hypr.log

edit: have a works.log too, you can diff the two and see some interesting differences

@vaxerski
Copy link
Member Author

they aren't trace, but thanks.

@vaxerski
Copy link
Member Author

lets move to #28

@vaxerski vaxerski deleted the fix-nv branch August 18, 2024 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants