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

[staging-20.09] mesa bugfix releases #105936

Merged
merged 3 commits into from Dec 13, 2020

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Dec 5, 2020

Motivation for this change

A game (Trine 4) has recently been crashing on me. Using a newer mesa bugfix release seems to solve this.

The last commit isn't a cherry-pick, because 20.1.10 was never on master, as it went to 20.2.x after 20.1.9.

Release notes:

cc @vcunat @primeos

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ajs124 ajs124 changed the base branch from release-20.09 to staging-20.09 December 5, 2020 01:44
@ajs124 ajs124 changed the title [20.09] mesa bugfix releases [staging-20.09] mesa bugfix releases Dec 5, 2020
@vcunat
Copy link
Member

vcunat commented Dec 5, 2020

OK in principle, but I'd feel safer if a few people (with different GPUs) tried this on their 20.09 system before we merge it into release-20.09. We had an unpleasant regression like this once.

It should be sufficient to test without a large rebuild. In past I've been using config like this (adapted to current version):

{
  imports = [
    (let mkDrivers = pkgs: (pkgs.mesa.overrideAttrs (a_: rec {
          branch = "20.1";
          version = "${branch}.10";
          src = pkgs.fetchurl {
            urls = [
              "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
              "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
              "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
              "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
            ];
            sha256 = "17zfqvc3q2pxy2bjwg8zp5sqqjlsv4rpizdx9k5rzb5d22csdnxi";
          };
        })).drivers;
      #pkgs = import (builtins.fetchTarball https://github.com/nixos/nixpkgs/archive/nixos-20.03.tar.gz) {};
      in { /*pkgs,*/... }: {
        hardware.opengl = {
          package = mkDrivers pkgs;
          package32 = mkDrivers pkgs.pkgsi686Linux;
        };
      }
    )
  ];
}

@dasJ
Copy link
Member

dasJ commented Dec 5, 2020

I'm on a Radeon RX 5600 (Navi 10) with amdgpu on 20.09 and I have the same issue with Trine 4 (what a coincidence!).
I'll play a few hours to test this (but the problem usually happens after about 1 min).

One thing to note, while @ajs124 is on X11 with KDE, I'm on Wayland with Sway, so I'm indirectly testing the patch on Wayland as well ;)

@dasJ
Copy link
Member

dasJ commented Dec 5, 2020

Well so… I wanted to say it all runs fine… until I chose to pick up a collectible letter I didn't have yet:

photo_2020-12-05_13-18-38

So you're probably fine unless you pick up letters (?)

Additional note: I really like how they incorperated my status bar and the rightmost part of my terminal into the game. Really gives me some good overview of my current PC state.

@dasJ
Copy link
Member

dasJ commented Dec 5, 2020

For anyone trying to reproduce this:
It was in Act II, The Thorny Hedge Maze at checkpoint 15 the first letter you find there.

Spoiler Start at checkpoint 15, place a plank in the spikes to your right. Dash onto the plank with the knight, discover the secret area.

Place a box inside the contraption, jump onto the contraption, jump to the left, and dash to the right with the knight. Pick up the letter, see the game crashing.

image

@vcunat
Copy link
Member

vcunat commented Dec 5, 2020

Well, I'm mainly concerned about big regressions making desktop unusable, etc. If nothing like that happens, maintenance updates sound a good idea even if it doesn't (fully) fix the Trine 4 case. I don't have this version of Trine myself.

@ajs124
Copy link
Member Author

ajs124 commented Dec 5, 2020

@dasJ can reproduce :'(

I'm on a RX580. This should still be merged IMHO, but more testing can't hurt.
The only other relevant GPU I have is an Intel iGPU, though.

@ajs124 ajs124 marked this pull request as ready for review December 5, 2020 17:07
@mweinelt mweinelt added this to Needs review in Staging (stable) Dec 8, 2020
@mweinelt
Copy link
Member

mweinelt commented Dec 8, 2020

How long do we want to wait for testers? Guess we only had amdgpu testers up to now. Unfortunately I'm on unstable with amdgpu as well.

@vcunat
Copy link
Member

vcunat commented Dec 9, 2020

I could also try an older Intel (Sandy Bridge, HD Graphics 3000), within a few days.

@vcunat
Copy link
Member

vcunat commented Dec 9, 2020

⬆️ I tried: desktop stuff, glxgears + glxinfo. I don't normally use this notebook, so no big testing.

@vcunat vcunat merged commit 9797466 into NixOS:staging-20.09 Dec 13, 2020
Staging (stable) automation moved this from Needs review to Done Dec 13, 2020
@ajs124 ajs124 deleted the upd/2009-mesa branch December 13, 2020 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants