From 370216d15ca82283e2336b36d5f7204b2d3c4d1f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 10 Nov 2023 22:54:26 +0100
Subject: [PATCH] does rocm work yet?

---
 hardware/gpu/rocm.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/hardware/gpu/rocm.nix b/hardware/gpu/rocm.nix
index 4c061fe..c319c20 100644
--- a/hardware/gpu/rocm.nix
+++ b/hardware/gpu/rocm.nix
@@ -3,24 +3,32 @@
   # assumes common-gpu-amd from nixos-hardware is also added
   # TODO: should we move it from flake.nix to here?
 
-  # nixos-hardware common-amd option
+  # nixos-hardware common-amd options
+  # https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/amd/default.nix
   hardware.amdgpu.opencl = true;
+  hardware.amdgpu.amdvlk = true;
 
+  hardware.opengl.enable = true;
+  # https://libreddit.noximilien.pbsds.net/r/archlinux/comments/nih9c9/amdgpu_vs_modesetting_in_current_510_kernels_xorg/
+  services.xserver.videoDrivers = [ "amdgpu" ]; # use gpu, adaptive sync and and hardware page flipping
+  #services.xserver.videoDrivers = [ "modesetting" ]; # integrated (non-accelerated) framebuffer, KMS
+  hardware.opengl.driSupport = true;
+  hardware.opengl.driSupport32Bit = true;
+  hardware.opengl.extraPackages = [
+    pkgs.rocm-opencl-icd
+    pkgs.rocm-runtime#-ext
+  ];
 
   nixpkgs.config.openglSupport = true; # why is this not set by hardware.opengl.enable ?
   nixpkgs.config.rocmSupport = true;
   nixpkgs.config.vdpauSupport  = true;
   nixpkgs.config.vaapiSupport  = true;
 
-
-  hardware.opengl.enable = true;
-  # https://libreddit.noximilien.pbsds.net/r/archlinux/comments/nih9c9/amdgpu_vs_modesetting_in_current_510_kernels_xorg/
-  services.xserver.videoDrivers = [ "amdgpu" ]; # use gpu, adaptive sync and and hardware page flipping
-  #services.xserver.videoDrivers = [ "modesetting" ]; # integrated (non-accelerated) framebuffer, KMS
-
+  # https://nixos.wiki/wiki/AMD_GPU#HIP
   systemd.tmpfiles.rules = [
     "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.hip}"
   ];
+
   environment.systemPackages = with pkgs; [
     nvtop-amd
   ];