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

xorg.xf86videoamdgpu: 21.0.0 -> 23.0.0 #218433

Merged
merged 1 commit into from
Mar 5, 2023
Merged

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Feb 26, 2023

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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.

@vcunat
Copy link
Member Author

vcunat commented Feb 26, 2023

Perhaps we should wait for at least one person running their desktop on this? It's quite inconvenient for me to try currently.

@vcunat
Copy link
Member Author

vcunat commented Feb 26, 2023

I could find no kind of announcement or NEWS, but it looks like bugfixes only:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/compare/xf86-video-amdgpu-21.0.0...xf86-video-amdgpu-23.0.0

@MasterMind2k
Copy link

Perhaps we should wait for at least one person running their desktop on this? It's quite inconvenient for me to try currently.

Is there a quick guide how to do this? I am willing to test it out.

@vcunat
Copy link
Member Author

vcunat commented Feb 26, 2023

Well, e.g. switch to this commit?

Usable git reference is e.g. git fetch origin refs/pull/218433/head
If you're using non-flake: nixos-rebuild -I nixpkgs=path/to/nixpkgs/repo switch

EDIT: actually it should even work with stuff like

nixos-rebuild -I nixpkgs=https://github.com/nixos/nixpkgs/archive/2faf6b3.tar.gz switch

@MasterMind2k
Copy link

It works, cursor is visible.

Notable difference to modesetting driver. With amdgpu xorg driver some apps are scaled as defined in nixos configuration. With xorg driver modesetting some apps do not scale.

Configuration snippet:

  services.xserver = {
    enable = true;
    videoDrivers = ["amdgpu"];

    # Enable the KDE Plasma Desktop Environment.
    displayManager.sddm.enable = true;
    desktopManager.plasma5.enable = true;

    # Configure keymap in X11
    layout = "si";
    xkbVariant = "";

    # hidpi
    dpi = 120;
  };

The apps running in following FHS don't scale with modesetting driver while under amdpu xorg driver they do:

{ pkgs ? import <nixpkgs> {}, command }:

(pkgs.buildFHSUserEnv {
  name = "Qt6-env";
  targetPkgs = pkgs: (with pkgs;
    [
      cacert
      alsa-lib
      libdrm
      libpulseaudio
      udev
      which
      libglvnd.dev
      libxkbcommon.dev
      nss
      libevdev
      nspr
      expat
      fontconfig
      bzip2
      dbus
      zlib
      glib
      pcre2.dev
      libpng.dev
      libcap.dev
      libgcrypt.dev
      zstd.dev
      lz4.dev
      libgpg-error.dev
      brotli.dev
      keyutils.dev
      lzma.dev
      freetype
      libkrb5
      gdb
      pkg-config
      gcc
      bintools
      git
      ccache
      clang-tools_14
      # Dev deps
      libyaml
      ffmpeg
    ]) ++ (with pkgs.xorg;
    [
      setxkbmap
      libX11.dev
      libXau.dev
      libXdmcp.dev
      libXcursor
      libXrandr
      libXext
      libxcb.dev
      xcbutilimage
      xcbutilkeysyms
      xcbutilrenderutil
      xcbutilwm
      libXcomposite
      libXdamage
      libXtst
      libXi
      libXfixes
      libXrender
      libxshmfence
      libxkbfile
      xf86inputevdev
    ]);
  profile = ''
    unset QT_PLUGIN_PATH
    unset QTWEBKIT_PLUGIN_PATH
    unset QML2_IMPORT_PATH
    export QML_DISABLE_DISK_CACHE=1
    export PATH="$HOME/Qt/Tools/QtCreator/bin:$HOME/Qt:$PATH"
  '';
  runScript = command;
}).env

This is unrelated with pull request but with modesetting driver.

@MasterMind2k
Copy link

Just found out. Also apps defined in KDE's autostart configuration are properly scaled with amdgpu XOrg driver.

@jansol
Copy link
Contributor

jansol commented Feb 26, 2023

Release announcement is here: https://lists.x.org/archives/dri-devel/2023-February/392659.html

Indeed only a couple of meaningful patches, the rest is just CI/docs fixes

@vcunat
Copy link
Member Author

vcunat commented Feb 26, 2023

Oh, I thought it would go to xorg-announce@lists.x.org like the rest. Well anyway, it's just auto-generated commit list.

@vcunat
Copy link
Member Author

vcunat commented Feb 26, 2023

Hmm, I tend to set DPI in the DE's tools (xfce4-appearance-settings in my case) and it seems to apply to all apps immediately (even if related to gnome or kde). It would be hard to miss for me, as I occasionally switch to a double or back... but I don't use that many apps commonly.

@vcunat vcunat merged commit 255bdfc into NixOS:master Mar 5, 2023
@vcunat vcunat deleted the p/amdgpu_bump branch March 5, 2023 08:31
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.

3 participants