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

Mesa 24.1 #306791

Merged
merged 2 commits into from
Jun 6, 2024
Merged

Mesa 24.1 #306791

merged 2 commits into from
Jun 6, 2024

Conversation

K900
Copy link
Contributor

@K900 K900 commented Apr 25, 2024

Description of changes

Much hack. Many oof.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@K900 K900 requested review from vcunat and alyssais April 25, 2024 14:46
@K900 K900 mentioned this pull request Apr 25, 2024
13 tasks
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good apart from the FIXME and:

pkgs/development/libraries/mesa/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/mesa/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/mesa/default.nix Show resolved Hide resolved
@K900
Copy link
Contributor Author

K900 commented Apr 25, 2024

Also fixed the fixme.

@matdibu
Copy link
Contributor

matdibu commented May 1, 2024

rc2 is out, if you want to update the draft

@K900 K900 force-pushed the mesa-24.1 branch 2 times, most recently from 0eebc5b to 1f1634c Compare May 2, 2024 18:53
@K900
Copy link
Contributor Author

K900 commented May 2, 2024

Confirmed RC2 builds, pushed.

@matdibu
Copy link
Contributor

matdibu commented May 8, 2024

rc3 was just released, could you check if there any regressions?

And out of pure curiosity, was there any kind of regression between rc1 and rc2?

@K900
Copy link
Contributor Author

K900 commented May 9, 2024

No issues on either rc2 or rc3. That said, updated.

@K900
Copy link
Contributor Author

K900 commented May 16, 2024

-rc4 works fine, also added xcbutilkeysyms to enable the Vulkan WSI to capture traces when a hotkey is pressed.

@benaryorg
Copy link
Contributor

benaryorg commented May 22, 2024

Quick note, newer versions (direct commits, but this might affect rc5 when it's out) break for me in some local testing these versions fail to build for nouveau if you're not building the radeonsi driver too it seems (which only happens if you override the package anyway), requiring the code from upstream MR № 26680 (as a patch) to compile.

@aviallon
Copy link
Contributor

24.1 is out

@K900
Copy link
Contributor Author

K900 commented May 23, 2024

Updated to 24.1.0 release, no issues here.

@pyrox0
Copy link
Member

pyrox0 commented May 29, 2024

Been testing this for a few days(AMD Drivers, Ryzen 7640HS CPU), and I'm seeing much better stability and performance than current main branch.

@niklaskorz
Copy link
Contributor

niklaskorz commented May 29, 2024

Tried on an Nvidia GPU (RTX 4090) to test the new NVK drivers with Vulkan 1.3 support, but unfortunately no Vulkan app launches (getting segmentation faults and out of memory errors on start). I don't think this is NixOS specific though, looks like my hopes for Nvidia on Mesa 24.1 were a bit too high. :') OpenGL works fine (tried Firefox, some WebGL websites, YouTube videos in 4K, Epiphany, VS Code, glxgears, sway, Gnome) and is even quite performant (~70% of the FPS I see on proprietary drivers for glxgears with swapinterval 0).

Edit: upstream issue is at https://gitlab.freedesktop.org/mesa/mesa/-/issues/11166
Edit 2: ok the referenced issue mentions a commit that is not even part of Mesa 24.1, so that's strange, must be something else then on my side...
Edit 3: NVK modifiers have been backported to 24.1 in this commit so it's likely causing my issues after all: https://gitlab.freedesktop.org/mesa/mesa/-/commit/9e27390d68bf15ca90b92a11b162b93c841e0659

@dskprt
Copy link

dskprt commented Jun 3, 2024

Any ETA on this?
The 24.1 release of Mesa is quite important to me and to support modern ARM SBCs, as it includes support for the Mali-G610 found in RK3588-based SOCs, in boards such as the Orange Pi 5 or Radxa Rock Pi 5

@K900
Copy link
Contributor Author

K900 commented Jun 3, 2024

We follow upstream Mesa guidance and don't ship .0 releases. Mesa 24.1.1 should be out in a few days, and we will ship that after a staging cycle.

@esdrastarsis
Copy link

@niklaskorz

getting segmentation faults and out of memory errors on start

Try with kernel 6.10-rc1 (or rc2), I was hitting the same issue on 6.9.2.
6.10-rc1 has an important patch for drm modifiers.

@esdrastarsis
Copy link

@niklaskorz This MR should fix the issue: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29563

@RossComputerGuy
Copy link
Member

Any ETA on this? The 24.1 release of Mesa is quite important to me and to support modern ARM SBCs, as it includes support for the Mali-G610 found in RK3588-based SOCs, in boards such as the Orange Pi 5 or Radxa Rock Pi 5

Also, Asahi driver is included.

@RossComputerGuy
Copy link
Member

Just changing the version and hash in this PR from what it currently is at to this builds fine. No other changes needed.

version = "24.1.1";
hash = "sha256-ADiCbG9+iNkLTOb3GRkvpYyn3t9O3KoRdM972SDvieo=";

K900 added 2 commits June 6, 2024 08:24
- build teflon as a separate output
- allow new Intel on non-x86
- libclc is a hard dependency now (for Intel, and later Asahi)
- fix Intel cross in presence of libclc
- NVK is no longer experimental
- add xcbutilkeysyms dependency to enable trace capture hotkey
@K900 K900 changed the base branch from staging to staging-next June 6, 2024 05:31
@K900 K900 changed the title [DO NOT MERGE] Mesa 24.1 Mesa 24.1 Jun 6, 2024
@K900 K900 marked this pull request as ready for review June 6, 2024 05:31
@K900
Copy link
Contributor Author

K900 commented Jun 6, 2024

Building a bunch of stuff locally to confirm, will merge after.

@K900 K900 merged commit d83111e into NixOS:staging-next Jun 6, 2024
26 of 28 checks passed
@vcunat
Copy link
Member

vcunat commented Jun 7, 2024

x86_64-darwin is broken: https://hydra.nixos.org/build/262379171
(aarch64-darwin perhaps as well; waiting for rustc fix first)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet