From 699821206ee186de7c3b17e83c3b9b4236276650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 26 Feb 2024 14:34:02 +0200 Subject: [PATCH 1/2] import orangepi5 From https://gitlab.com/K900/nix.git/ aea8b7d06dceb9a72d38219d424967ef091d4827 --- hacks/orangepi5/mesa/default.nix | 492 ++++++++++++++++++++++++++++++ hacks/orangepi5/mesa/opencl.patch | 66 ++++ hacks/orangepi5/uboot/default.nix | 60 ++++ hacks/orangepi5/uboot/sata.patch | 34 +++ shared/platform/orangepi5.nix | 69 +++++ 5 files changed, 721 insertions(+) create mode 100644 hacks/orangepi5/mesa/default.nix create mode 100644 hacks/orangepi5/mesa/opencl.patch create mode 100644 hacks/orangepi5/uboot/default.nix create mode 100644 hacks/orangepi5/uboot/sata.patch create mode 100644 shared/platform/orangepi5.nix diff --git a/hacks/orangepi5/mesa/default.nix b/hacks/orangepi5/mesa/default.nix new file mode 100644 index 0000000..4b13bb6 --- /dev/null +++ b/hacks/orangepi5/mesa/default.nix @@ -0,0 +1,492 @@ +{ + stdenv, + lib, + fetchurl, + fetchCrate, + buildPackages, + meson, + pkg-config, + ninja, + intltool, + bison, + flex, + file, + python3Packages, + wayland-scanner, + expat, + libdrm, + xorg, + wayland, + wayland-protocols, + openssl, + llvmPackages, + libffi, + libomxil-bellagio, + libva-minimal, + libelf, + libvdpau, + libglvnd, + libunwind, + lm_sensors, + vulkan-loader, + glslang, + galliumDrivers ? + if stdenv.isLinux + then + [ + "d3d12" # WSL emulated GPU (aka Dozen) + "kmsro" # special "render only" driver for GPUs without a display controller + "nouveau" # Nvidia + "radeonsi" # new AMD (GCN+) + "r300" # very old AMD + "r600" # less old AMD + "swrast" # software renderer (aka LLVMPipe) + "svga" # VMWare virtualized GPU + "virgl" # QEMU virtualized GPU (aka VirGL) + "zink" # generic OpenGL over Vulkan, experimental + ] + ++ lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "lima" # ARM Mali 4xx + "panfrost" # ARM Mali Midgard and up (T/G series) + "vc4" # Broadcom VC4 (Raspberry Pi 0-3) + ] + ++ lib.optionals stdenv.isAarch64 [ + "tegra" # Nvidia Tegra SoCs + "v3d" # Broadcom VC5 (Raspberry Pi 4) + ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ + "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 + "crocus" # Intel legacy, x86 only + "i915" # Intel extra legacy, x86 only + ] + else ["auto"], + vulkanDrivers ? + if stdenv.isLinux + then + [ + "amd" # AMD (aka RADV) + "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) + "nouveau-experimental" # Nouveau (aka NVK) + "swrast" # software renderer (aka Lavapipe) + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ + # QEMU virtualized GPU (aka VirGL) + # Requires ATOMIC_INT_LOCK_FREE == 2. + "virtio" + ] + ++ lib.optionals stdenv.isAarch64 [ + "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "imagination-experimental" # PowerVR Rogue (currently N/A) + "panfrost" # ARM Mali Midgard and up (T/G series) + ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ + "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build + "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) + ] + else ["auto"], + eglPlatforms ? ["x11"] ++ lib.optionals stdenv.isLinux ["wayland"], + vulkanLayers ? lib.optionals (!stdenv.isDarwin) ["device-select" "overlay" "intel-nullhw"], # No Vulkan support on Darwin + OpenGL, + Xplugin, + withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, + valgrind-light, + withLibunwind ? lib.meta.availableOn stdenv.hostPlatform libunwind, + enableGalliumNine ? stdenv.isLinux, + enableOSMesa ? stdenv.isLinux, + enableOpenCL ? stdenv.isLinux && stdenv.isx86_64, + enablePatentEncumberedCodecs ? true, + enableVaapi ? stdenv.isLinux, + enableVdpau ? stdenv.isLinux, + enableXa ? stdenv.isLinux, + jdupes, + rustPlatform, + rust-bindgen, + rustc, + spirv-llvm-translator, + zstd, + directx-headers, + udev, +}: +# When updating this package, please verify at least these build (assuming x86_64-linux): +# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa +let + version = "24.0.1"; + hash = "sha256-84cZKwjEccVFWQ3RIjCio0MkSAS1/oZv7GrqAuq1dhM="; + + # Release calendar: https://www.mesa3d.org/release-calendar.html + # Release frequency: https://www.mesa3d.org/releasing.html#schedule + branch = lib.versions.major version; + + withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; + + haveWayland = lib.elem "wayland" eglPlatforms; + haveZink = lib.elem "zink" galliumDrivers; + haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); + + rustDeps = [ + { + pname = "proc-macro2"; + version = "1.0.70"; + hash = "sha256-e4ZgyZUTu5nAtaH5QVkLelqJQX/XPj/rWkzf/g2c+1g="; + } + { + pname = "quote"; + version = "1.0.33"; + hash = "sha256-VWRCZJO0/DJbNu0/V9TLaqlwMot65YjInWT9VWg57DY="; + } + { + pname = "syn"; + version = "2.0.39"; + hash = "sha256-Mjen2L/omhVbhU/+Ao65mogs3BP3fY+Bodab3uU63EI="; + } + { + pname = "unicode-ident"; + version = "1.0.12"; + hash = "sha256-KX8NqYYw6+rGsoR9mdZx8eT1HIPEUUyxErdk2H/Rlj8="; + } + ]; + + copyRustDep = dep: '' + cp -R --no-preserve=mode,ownership ${fetchCrate dep} subprojects/${dep.pname}-${dep.version} + cp -R subprojects/packagefiles/${dep.pname}/* subprojects/${dep.pname}-${dep.version}/ + ''; + + copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps); + + self = stdenv.mkDerivation { + pname = "mesa"; + inherit version; + + src = fetchurl { + urls = [ + "https://archive.mesa3d.org/mesa-${version}.tar.xz" + "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" + "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" + ]; + inherit hash; + }; + + patches = [ + ./opencl.patch + ]; + + postPatch = '' + patchShebangs . + + # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency: + substituteInPlace src/util/xmlconfig.c --replace \ + 'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"' + substituteInPlace src/util/meson.build --replace \ + "get_option('datadir')" "'${placeholder "out"}/share'" + substituteInPlace src/amd/vulkan/meson.build --replace \ + "get_option('datadir')" "'${placeholder "out"}/share'" + + ${copyRustDeps} + ''; + + outputs = + ["out" "dev" "drivers"] + ++ lib.optional enableOSMesa "osmesa" + ++ lib.optional stdenv.isLinux "driversdev" + ++ lib.optional enableOpenCL "opencl" + # the Dozen drivers depend on libspirv2dxil, but link it statically, and + # libspirv2dxil itself is pretty chonky, so relocate it to its own output + # in case anything wants to use it at some point + ++ lib.optional haveDozen "spirv2dxil"; + + # Keep build-ids so drivers can use them for caching, etc. + # Also some drivers segfault without this. + separateDebugInfo = true; + + # Needed to discover llvm-config for cross + preConfigure = '' + PATH=${llvmPackages.libllvm.dev}/bin:$PATH + ''; + + mesonFlags = + [ + "--sysconfdir=/etc" + "--datadir=${placeholder "drivers"}/share" # Vendor files + + # Don't build in debug mode + # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 + "-Db_ndebug=true" + + "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" + + "-Dplatforms=${lib.concatStringsSep "," eglPlatforms}" + "-Dgallium-drivers=${lib.concatStringsSep "," galliumDrivers}" + "-Dvulkan-drivers=${lib.concatStringsSep "," vulkanDrivers}" + + "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri" + "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau" + "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" + "-Dva-libs-path=${placeholder "drivers"}/lib/dri" + "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" + + "-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine + "-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine + "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) + + # To enable non-mesa gbm backends to be found (e.g. Nvidia) + "-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm" + + # meson auto_features enables these features, but we do not want them + "-Dandroid-libbacktrace=disabled" + ] + ++ lib.optionals stdenv.isLinux [ + "-Dglvnd=true" + (lib.mesonEnable "intel-rt" stdenv.isx86_64) + (lib.mesonEnable "gallium-vdpau" enableVdpau) + (lib.mesonEnable "gallium-va" enableVaapi) + (lib.mesonEnable "gallium-xa" enableXa) + ] + ++ lib.optionals stdenv.isDarwin [ + # Disable features that are explicitly unsupported on the platform + "-Dgbm=disabled" + "-Dxlib-lease=disabled" + "-Degl=disabled" + "-Dgallium-vdpau=disabled" + "-Dgallium-va=disabled" + "-Dgallium-xa=disabled" + "-Dlmsensors=disabled" + ] + ++ lib.optionals enableOpenCL [ + # Clover, old OpenCL frontend + "-Dgallium-opencl=icd" + "-Dopencl-spirv=true" + + # Rusticl, new OpenCL frontend + "-Dgallium-rusticl=true" + "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" + ] + ++ lib.optionals (!withValgrind) [ + "-Dvalgrind=disabled" + ] + ++ lib.optionals (!withLibunwind) [ + "-Dlibunwind=disabled" + ] + ++ lib.optional enablePatentEncumberedCodecs + "-Dvideo-codecs=all" + ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; + + strictDeps = true; + + buildInputs = with xorg; + [ + expat + glslang + llvmPackages.libllvm + libglvnd + xorgproto + libX11 + libXext + libxcb + libXt + libXfixes + libxshmfence + libXrandr + libffi + libvdpau + libelf + libXvMC + libpthreadstubs + openssl + zstd + ] + ++ lib.optionals withLibunwind [ + libunwind + ] + ++ [ + python3Packages.python # for shebang + ] + ++ lib.optionals haveWayland [wayland wayland-protocols] + ++ lib.optionals stdenv.isLinux [libomxil-bellagio libva-minimal udev lm_sensors] + ++ lib.optionals enableOpenCL [llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator] + ++ lib.optional withValgrind valgrind-light + ++ lib.optional haveZink vulkan-loader + ++ lib.optional haveDozen directx-headers; + + depsBuildBuild = [pkg-config buildPackages.stdenv.cc]; + + nativeBuildInputs = + [ + meson + pkg-config + ninja + intltool + bison + flex + file + python3Packages.python + python3Packages.mako + python3Packages.ply + jdupes + glslang + rustc + rust-bindgen + rustPlatform.bindgenHook + ] + ++ lib.optional haveWayland wayland-scanner; + + propagatedBuildInputs = with xorg; + [ + libXdamage + libXxf86vm + ] + ++ lib.optional withLibdrm libdrm + ++ lib.optionals stdenv.isDarwin [OpenGL Xplugin]; + + doCheck = false; + + postInstall = + '' + # Some installs don't have any drivers so this directory is never created. + mkdir -p $drivers $osmesa + '' + + lib.optionalString stdenv.isLinux '' + mkdir -p $drivers/lib + + if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM + mv -t $drivers/lib \ + $out/lib/libpowervr_rogue* \ + $out/lib/libxatracker* \ + $out/lib/libvulkan_* + fi + + if [ -n "$(shopt -s nullglob; echo "$out"/lib/lib*_mesa*)" ]; then + # Move other drivers to a separate output + mv -t $drivers/lib $out/lib/lib*_mesa* + fi + + # Update search path used by glvnd + for js in $drivers/share/glvnd/egl_vendor.d/*.json; do + substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" + done + + # Update search path used by Vulkan (it's pointing to $out but + # drivers are in $drivers) + for js in $drivers/share/vulkan/icd.d/*.json; do + substituteInPlace "$js" --replace "$out" "$drivers" + done + '' + + lib.optionalString enableOpenCL '' + # Move OpenCL stuff + mkdir -p $opencl/lib + mv -t "$opencl/lib/" \ + $out/lib/gallium-pipe \ + $out/lib/lib*OpenCL* + + # We construct our own .icd files that contain absolute paths. + mkdir -p $opencl/etc/OpenCL/vendors/ + echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd + echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd + '' + + lib.optionalString enableOSMesa '' + # move libOSMesa to $osmesa, as it's relatively big + mkdir -p $osmesa/lib + mv -t $osmesa/lib/ $out/lib/libOSMesa* + '' + + lib.optionalString (vulkanLayers != []) '' + mv -t $drivers/lib $out/lib/libVkLayer* + for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do + substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_" + done + '' + + lib.optionalString haveDozen '' + mkdir -p $spirv2dxil/{bin,lib} + mv -t $spirv2dxil/lib $out/lib/libspirv_to_dxil* + mv -t $spirv2dxil/bin $out/bin/spirv2dxil + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + # set the default search path for DRI drivers; used e.g. by X server + for pc in lib/pkgconfig/{dri,d3d}.pc; do + [ -f "$dev/$pc" ] && substituteInPlace "$dev/$pc" --replace "$drivers" "${libglvnd.driverLink}" + done + + # remove pkgconfig files for GL/EGL; they are provided by libGL. + rm -f $dev/lib/pkgconfig/{gl,egl}.pc + + # Move development files for libraries in $drivers to $driversdev + mkdir -p $driversdev/include + mv $dev/include/xa_* $dev/include/d3d* -t $driversdev/include || true + mkdir -p $driversdev/lib/pkgconfig + for pc in lib/pkgconfig/{xatracker,d3d}.pc; do + if [ -f "$dev/$pc" ]; then + substituteInPlace "$dev/$pc" --replace $out $drivers + mv $dev/$pc $driversdev/$pc + fi + done + + # Don't depend on build python + patchShebangs --host --update $out/bin/* + + # NAR doesn't support hard links, so convert them to symlinks to save space. + jdupes --hard-links --link-soft --recurse "$drivers" + + # add RPATH so the drivers can find the moved libgallium and libdricore9 + # moved here to avoid problems with stripping patchelfed files + for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do + if [[ ! -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" + fi + done + # add RPATH here so Zink can find libvulkan.so + ${lib.optionalString haveZink '' + patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so + ''} + ''; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin ["-fno-common"] + ++ lib.optionals enableOpenCL [ + "-UPIPE_SEARCH_DIR" + "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" + ]); + + passthru = { + inherit (libglvnd) driverLink; + inherit llvmPackages; + + libdrm = + if withLibdrm + then libdrm + else null; + + tests = lib.optionalAttrs stdenv.isLinux { + devDoesNotDependOnLLVM = stdenv.mkDerivation { + name = "mesa-dev-does-not-depend-on-llvm"; + buildCommand = '' + echo ${self.dev} >>$out + ''; + disallowedRequisites = [llvmPackages.llvm self.drivers]; + }; + }; + }; + + meta = with lib; { + description = "An open source 3D graphics library"; + longDescription = '' + The Mesa project began as an open-source implementation of the OpenGL + specification - a system for rendering interactive 3D graphics. Over the + years the project has grown to implement more graphics APIs, including + OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and + Vulkan. A variety of device drivers allows the Mesa libraries to be used + in many different environments ranging from software emulation to + complete hardware acceleration for modern GPUs. + ''; + homepage = "https://www.mesa3d.org/"; + changelog = "https://www.mesa3d.org/relnotes/${version}.html"; + license = licenses.mit; # X11 variant, in most files + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [primeos vcunat]; # Help is welcome :) + }; + }; +in + self diff --git a/hacks/orangepi5/mesa/opencl.patch b/hacks/orangepi5/mesa/opencl.patch new file mode 100644 index 0000000..cd27f0a --- /dev/null +++ b/hacks/orangepi5/mesa/opencl.patch @@ -0,0 +1,66 @@ +diff --git a/meson.build b/meson.build +index fbb0b29322d..b4825056449 100644 +--- a/meson.build ++++ b/meson.build +@@ -1805,7 +1805,7 @@ endif + + dep_clang = null_dep + if with_clc +- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') ++ llvm_libdir = get_option('clang-libdir') + + dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) + +diff --git a/meson_options.txt b/meson_options.txt +index e885ba61a8a..591ed957c85 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -23,6 +23,12 @@ option( + description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY', + ) + ++option( ++ 'clang-libdir', ++ type : 'string', ++ value : '', ++ description : 'Locations to search for clang libraries.' ++) + option( + 'android-stub', + type : 'boolean', +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index 7c14135898e..74dc6850603 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') + polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false) + endif + +-dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) ++clang_libdir = get_option('clang-libdir') ++dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false) + + # meson will return clang-cpp from system dirs if it's not found in llvm_libdir + linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir) +@@ -123,7 +124,7 @@ if with_opencl_icd + configuration : _config, + input : 'mesa.icd.in', + output : 'mesa.icd', +- install : true, ++ install : false, + install_tag : 'runtime', + install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), + ) +diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build +index b2963fe6dfa..99d6d801b94 100644 +--- a/src/gallium/targets/rusticl/meson.build ++++ b/src/gallium/targets/rusticl/meson.build +@@ -76,7 +76,7 @@ configure_file( + configuration : _config, + input : 'rusticl.icd.in', + output : 'rusticl.icd', +- install : true, ++ install : false, + install_tag : 'runtime', + install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), + ) diff --git a/hacks/orangepi5/uboot/default.nix b/hacks/orangepi5/uboot/default.nix new file mode 100644 index 0000000..7d9ceb2 --- /dev/null +++ b/hacks/orangepi5/uboot/default.nix @@ -0,0 +1,60 @@ +{ + fetchFromGitLab, + fetchFromGitHub, + buildArmTrustedFirmware, + buildUBoot, +}: let + rkbin = fetchFromGitHub { + owner = "rockchip-linux"; + repo = "rkbin"; + rev = "b4558da0860ca48bf1a571dd33ccba580b9abe23"; + hash = "sha256-KUZQaQ+IZ0OynawlYGW99QGAOmOrGt2CZidI3NTxFw8="; + }; + + tfa = + (buildArmTrustedFirmware rec { + extraMakeFlags = ["bl31"]; + platform = "rk3588"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["build/${platform}/release/bl31/bl31.elf"]; + }) + .overrideAttrs (_: { + src = fetchFromGitLab { + domain = "gitlab.collabora.com"; + owner = "hardware-enablement"; + repo = "rockchip-3588/trusted-firmware-a"; + rev = "002d8e85ce5f4f06ebc2c2c52b4923a514bfa701"; + hash = "sha256-1XOG7ILIgWa3uXUmAh9WTfSGLD/76OsmWrUhIxm/zTg="; + }; + }); +in + buildUBoot rec { + version = "2024.01"; + + src = fetchFromGitLab { + domain = "source.denx.de"; + owner = "u-boot"; + repo = "u-boot"; + rev = "v${version}"; + hash = "sha256-0Da7Czy9cpQ+D5EICc3/QSZhAdCBsmeMvBgykYhAQFw="; + }; + + patches = [./sata.patch]; + + defconfig = "orangepi-5-rk3588s_defconfig"; + extraConfig = '' + CONFIG_ROCKCHIP_SPI_IMAGE=y + CONFIG_SATA=y + CONFIG_CMD_SATA=y + ''; + + ROCKCHIP_TPL = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin"; + BL31 = "${tfa}/bl31.elf"; + + # FIXME: seems to not like nixpkgs dtc for some reason + extraMakeFlags = ["DTC=./scripts/dtc/dtc"]; + + filesToInstall = [".config" "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin"]; + + extraMeta.platforms = ["aarch64-linux"]; + } diff --git a/hacks/orangepi5/uboot/sata.patch b/hacks/orangepi5/uboot/sata.patch new file mode 100644 index 0000000..160096b --- /dev/null +++ b/hacks/orangepi5/uboot/sata.patch @@ -0,0 +1,34 @@ +diff --git a/arch/arm/dts/rk3588s-orangepi-5.dts b/arch/arm/dts/rk3588s-orangepi-5.dts +index 8f399c4317..3997984e42 100644 +--- a/arch/arm/dts/rk3588s-orangepi-5.dts ++++ b/arch/arm/dts/rk3588s-orangepi-5.dts +@@ -238,7 +238,7 @@ + &pcie2x1l2 { + reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie20>; +- status = "okay"; ++ status = "disabled"; + }; + + &pinctrl { +@@ -660,3 +660,7 @@ + &usb_host1_ohci { + status = "okay"; + }; ++ ++&sata0 { ++ status = "okay"; ++}; +diff --git a/arch/arm/dts/rk3588s.dtsi b/arch/arm/dts/rk3588s.dtsi +index 61a9a11c3b..05028012ce 100644 +--- a/arch/arm/dts/rk3588s.dtsi ++++ b/arch/arm/dts/rk3588s.dtsi +@@ -1390,6 +1390,8 @@ + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; ++ phys = <&combphy0_ps PHY_TYPE_SATA>; ++ phy-names = "sata-phy"; + + sata-port@0 { + reg = <0>; diff --git a/shared/platform/orangepi5.nix b/shared/platform/orangepi5.nix new file mode 100644 index 0000000..7efa1c7 --- /dev/null +++ b/shared/platform/orangepi5.nix @@ -0,0 +1,69 @@ +{ + config, + lib, + pkgs, + pkgsHost, + inputs, + ... +}: let + crossPkgs = pkgsHost.pkgsCross.aarch64-multiplatform; +in { + boot = { + kernelPackages = crossPkgs.linuxPackagesFor (crossPkgs.buildLinux { + version = "6.8.0-rc1"; + modDirVersion = "6.8.0-rc1"; + + src = inputs.linux-rockchip-collabora; + kernelPatches = []; + + extraMeta.branch = "6.8"; + }); + + loader = { + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; + + initrd.kernelModules = ["ahci_dwc" "phy_rockchip_naneng_combphy"]; + consoleLogLevel = 7; + }; + + hardware = { + deviceTree.name = "rockchip/rk3588s-orangepi-5.dtb"; + + opengl.package = let + mesa = pkgs.callPackage ../../hacks/orangepi5/mesa { + galliumDrivers = ["panfrost"]; + vulkanDrivers = ["panfrost"]; + OpenGL = null; + Xplugin = null; + enableGalliumNine = false; + enableOSMesa = false; + enableVaapi = false; + enableVdpau = false; + enableXa = false; + }; + mesa-panthor = mesa.overrideAttrs (_: { + src = inputs.mesa-panthor; + }); + in + mesa-panthor.drivers; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + options = ["noatime"]; + }; + }; + + system.build = { + sdImage = import "${inputs.nixpkgs}/nixos/lib/make-disk-image.nix" { + name = "orangepi5-sd-image"; + copyChannel = false; + inherit config lib pkgs; + }; + uboot = crossPkgs.callPackage ../../hacks/orangepi5/uboot {}; + }; +} From a33c69dcaaae3fe74e3881248d081b0b6549e42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 26 Feb 2024 15:20:57 +0200 Subject: [PATCH 2/2] remove sata, use our fork --- flake.nix | 14 + hacks/orangepi5/mesa/default.nix | 492 ------------------------------ hacks/orangepi5/mesa/opencl.patch | 66 ---- hacks/orangepi5/uboot/default.nix | 4 - hosts/op5p/configuration.nix | 53 ++++ shared/platform/orangepi5.nix | 41 +-- 6 files changed, 82 insertions(+), 588 deletions(-) delete mode 100644 hacks/orangepi5/mesa/default.nix delete mode 100644 hacks/orangepi5/mesa/opencl.patch create mode 100644 hosts/op5p/configuration.nix diff --git a/flake.nix b/flake.nix index 85a58b2..8154db0 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,11 @@ }; }; + #linux-rockchip-collabora = { + # url = "git+https://git.jakstys.lt/motiejus/linux?ref=rk3588"; + # flake = false; + #}; + e11sync = { url = "git+https://git.jakstys.lt/motiejus/e11sync"; inputs = { @@ -125,6 +130,15 @@ specialArgs = {inherit myData;} // inputs; }; + op5p = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + {nixpkgs.overlays = overlays;} + ./hosts/op5p/configuration.nix + ]; + specialArgs = {inherit myData;} // inputs; + }; + vno1-oh2 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ diff --git a/hacks/orangepi5/mesa/default.nix b/hacks/orangepi5/mesa/default.nix deleted file mode 100644 index 4b13bb6..0000000 --- a/hacks/orangepi5/mesa/default.nix +++ /dev/null @@ -1,492 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchCrate, - buildPackages, - meson, - pkg-config, - ninja, - intltool, - bison, - flex, - file, - python3Packages, - wayland-scanner, - expat, - libdrm, - xorg, - wayland, - wayland-protocols, - openssl, - llvmPackages, - libffi, - libomxil-bellagio, - libva-minimal, - libelf, - libvdpau, - libglvnd, - libunwind, - lm_sensors, - vulkan-loader, - glslang, - galliumDrivers ? - if stdenv.isLinux - then - [ - "d3d12" # WSL emulated GPU (aka Dozen) - "kmsro" # special "render only" driver for GPUs without a display controller - "nouveau" # Nvidia - "radeonsi" # new AMD (GCN+) - "r300" # very old AMD - "r600" # less old AMD - "swrast" # software renderer (aka LLVMPipe) - "svga" # VMWare virtualized GPU - "virgl" # QEMU virtualized GPU (aka VirGL) - "zink" # generic OpenGL over Vulkan, experimental - ] - ++ lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ - "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) - "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) - "lima" # ARM Mali 4xx - "panfrost" # ARM Mali Midgard and up (T/G series) - "vc4" # Broadcom VC4 (Raspberry Pi 0-3) - ] - ++ lib.optionals stdenv.isAarch64 [ - "tegra" # Nvidia Tegra SoCs - "v3d" # Broadcom VC5 (Raspberry Pi 4) - ] - ++ lib.optionals stdenv.hostPlatform.isx86 [ - "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 - "crocus" # Intel legacy, x86 only - "i915" # Intel extra legacy, x86 only - ] - else ["auto"], - vulkanDrivers ? - if stdenv.isLinux - then - [ - "amd" # AMD (aka RADV) - "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) - "nouveau-experimental" # Nouveau (aka NVK) - "swrast" # software renderer (aka Lavapipe) - ] - ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ - # QEMU virtualized GPU (aka VirGL) - # Requires ATOMIC_INT_LOCK_FREE == 2. - "virtio" - ] - ++ lib.optionals stdenv.isAarch64 [ - "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) - "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) - "imagination-experimental" # PowerVR Rogue (currently N/A) - "panfrost" # ARM Mali Midgard and up (T/G series) - ] - ++ lib.optionals stdenv.hostPlatform.isx86 [ - "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build - "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) - ] - else ["auto"], - eglPlatforms ? ["x11"] ++ lib.optionals stdenv.isLinux ["wayland"], - vulkanLayers ? lib.optionals (!stdenv.isDarwin) ["device-select" "overlay" "intel-nullhw"], # No Vulkan support on Darwin - OpenGL, - Xplugin, - withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, - valgrind-light, - withLibunwind ? lib.meta.availableOn stdenv.hostPlatform libunwind, - enableGalliumNine ? stdenv.isLinux, - enableOSMesa ? stdenv.isLinux, - enableOpenCL ? stdenv.isLinux && stdenv.isx86_64, - enablePatentEncumberedCodecs ? true, - enableVaapi ? stdenv.isLinux, - enableVdpau ? stdenv.isLinux, - enableXa ? stdenv.isLinux, - jdupes, - rustPlatform, - rust-bindgen, - rustc, - spirv-llvm-translator, - zstd, - directx-headers, - udev, -}: -# When updating this package, please verify at least these build (assuming x86_64-linux): -# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa -let - version = "24.0.1"; - hash = "sha256-84cZKwjEccVFWQ3RIjCio0MkSAS1/oZv7GrqAuq1dhM="; - - # Release calendar: https://www.mesa3d.org/release-calendar.html - # Release frequency: https://www.mesa3d.org/releasing.html#schedule - branch = lib.versions.major version; - - withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; - - haveWayland = lib.elem "wayland" eglPlatforms; - haveZink = lib.elem "zink" galliumDrivers; - haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); - - rustDeps = [ - { - pname = "proc-macro2"; - version = "1.0.70"; - hash = "sha256-e4ZgyZUTu5nAtaH5QVkLelqJQX/XPj/rWkzf/g2c+1g="; - } - { - pname = "quote"; - version = "1.0.33"; - hash = "sha256-VWRCZJO0/DJbNu0/V9TLaqlwMot65YjInWT9VWg57DY="; - } - { - pname = "syn"; - version = "2.0.39"; - hash = "sha256-Mjen2L/omhVbhU/+Ao65mogs3BP3fY+Bodab3uU63EI="; - } - { - pname = "unicode-ident"; - version = "1.0.12"; - hash = "sha256-KX8NqYYw6+rGsoR9mdZx8eT1HIPEUUyxErdk2H/Rlj8="; - } - ]; - - copyRustDep = dep: '' - cp -R --no-preserve=mode,ownership ${fetchCrate dep} subprojects/${dep.pname}-${dep.version} - cp -R subprojects/packagefiles/${dep.pname}/* subprojects/${dep.pname}-${dep.version}/ - ''; - - copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps); - - self = stdenv.mkDerivation { - pname = "mesa"; - inherit version; - - src = fetchurl { - urls = [ - "https://archive.mesa3d.org/mesa-${version}.tar.xz" - "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" - "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" - ]; - inherit hash; - }; - - patches = [ - ./opencl.patch - ]; - - postPatch = '' - patchShebangs . - - # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency: - substituteInPlace src/util/xmlconfig.c --replace \ - 'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"' - substituteInPlace src/util/meson.build --replace \ - "get_option('datadir')" "'${placeholder "out"}/share'" - substituteInPlace src/amd/vulkan/meson.build --replace \ - "get_option('datadir')" "'${placeholder "out"}/share'" - - ${copyRustDeps} - ''; - - outputs = - ["out" "dev" "drivers"] - ++ lib.optional enableOSMesa "osmesa" - ++ lib.optional stdenv.isLinux "driversdev" - ++ lib.optional enableOpenCL "opencl" - # the Dozen drivers depend on libspirv2dxil, but link it statically, and - # libspirv2dxil itself is pretty chonky, so relocate it to its own output - # in case anything wants to use it at some point - ++ lib.optional haveDozen "spirv2dxil"; - - # Keep build-ids so drivers can use them for caching, etc. - # Also some drivers segfault without this. - separateDebugInfo = true; - - # Needed to discover llvm-config for cross - preConfigure = '' - PATH=${llvmPackages.libllvm.dev}/bin:$PATH - ''; - - mesonFlags = - [ - "--sysconfdir=/etc" - "--datadir=${placeholder "drivers"}/share" # Vendor files - - # Don't build in debug mode - # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 - "-Db_ndebug=true" - - "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" - - "-Dplatforms=${lib.concatStringsSep "," eglPlatforms}" - "-Dgallium-drivers=${lib.concatStringsSep "," galliumDrivers}" - "-Dvulkan-drivers=${lib.concatStringsSep "," vulkanDrivers}" - - "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri" - "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau" - "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" - "-Dva-libs-path=${placeholder "drivers"}/lib/dri" - "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" - - "-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine - "-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine - "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) - - # To enable non-mesa gbm backends to be found (e.g. Nvidia) - "-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm" - - # meson auto_features enables these features, but we do not want them - "-Dandroid-libbacktrace=disabled" - ] - ++ lib.optionals stdenv.isLinux [ - "-Dglvnd=true" - (lib.mesonEnable "intel-rt" stdenv.isx86_64) - (lib.mesonEnable "gallium-vdpau" enableVdpau) - (lib.mesonEnable "gallium-va" enableVaapi) - (lib.mesonEnable "gallium-xa" enableXa) - ] - ++ lib.optionals stdenv.isDarwin [ - # Disable features that are explicitly unsupported on the platform - "-Dgbm=disabled" - "-Dxlib-lease=disabled" - "-Degl=disabled" - "-Dgallium-vdpau=disabled" - "-Dgallium-va=disabled" - "-Dgallium-xa=disabled" - "-Dlmsensors=disabled" - ] - ++ lib.optionals enableOpenCL [ - # Clover, old OpenCL frontend - "-Dgallium-opencl=icd" - "-Dopencl-spirv=true" - - # Rusticl, new OpenCL frontend - "-Dgallium-rusticl=true" - "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" - ] - ++ lib.optionals (!withValgrind) [ - "-Dvalgrind=disabled" - ] - ++ lib.optionals (!withLibunwind) [ - "-Dlibunwind=disabled" - ] - ++ lib.optional enablePatentEncumberedCodecs - "-Dvideo-codecs=all" - ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; - - strictDeps = true; - - buildInputs = with xorg; - [ - expat - glslang - llvmPackages.libllvm - libglvnd - xorgproto - libX11 - libXext - libxcb - libXt - libXfixes - libxshmfence - libXrandr - libffi - libvdpau - libelf - libXvMC - libpthreadstubs - openssl - zstd - ] - ++ lib.optionals withLibunwind [ - libunwind - ] - ++ [ - python3Packages.python # for shebang - ] - ++ lib.optionals haveWayland [wayland wayland-protocols] - ++ lib.optionals stdenv.isLinux [libomxil-bellagio libva-minimal udev lm_sensors] - ++ lib.optionals enableOpenCL [llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator] - ++ lib.optional withValgrind valgrind-light - ++ lib.optional haveZink vulkan-loader - ++ lib.optional haveDozen directx-headers; - - depsBuildBuild = [pkg-config buildPackages.stdenv.cc]; - - nativeBuildInputs = - [ - meson - pkg-config - ninja - intltool - bison - flex - file - python3Packages.python - python3Packages.mako - python3Packages.ply - jdupes - glslang - rustc - rust-bindgen - rustPlatform.bindgenHook - ] - ++ lib.optional haveWayland wayland-scanner; - - propagatedBuildInputs = with xorg; - [ - libXdamage - libXxf86vm - ] - ++ lib.optional withLibdrm libdrm - ++ lib.optionals stdenv.isDarwin [OpenGL Xplugin]; - - doCheck = false; - - postInstall = - '' - # Some installs don't have any drivers so this directory is never created. - mkdir -p $drivers $osmesa - '' - + lib.optionalString stdenv.isLinux '' - mkdir -p $drivers/lib - - if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then - # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM - mv -t $drivers/lib \ - $out/lib/libpowervr_rogue* \ - $out/lib/libxatracker* \ - $out/lib/libvulkan_* - fi - - if [ -n "$(shopt -s nullglob; echo "$out"/lib/lib*_mesa*)" ]; then - # Move other drivers to a separate output - mv -t $drivers/lib $out/lib/lib*_mesa* - fi - - # Update search path used by glvnd - for js in $drivers/share/glvnd/egl_vendor.d/*.json; do - substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" - done - - # Update search path used by Vulkan (it's pointing to $out but - # drivers are in $drivers) - for js in $drivers/share/vulkan/icd.d/*.json; do - substituteInPlace "$js" --replace "$out" "$drivers" - done - '' - + lib.optionalString enableOpenCL '' - # Move OpenCL stuff - mkdir -p $opencl/lib - mv -t "$opencl/lib/" \ - $out/lib/gallium-pipe \ - $out/lib/lib*OpenCL* - - # We construct our own .icd files that contain absolute paths. - mkdir -p $opencl/etc/OpenCL/vendors/ - echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd - echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd - '' - + lib.optionalString enableOSMesa '' - # move libOSMesa to $osmesa, as it's relatively big - mkdir -p $osmesa/lib - mv -t $osmesa/lib/ $out/lib/libOSMesa* - '' - + lib.optionalString (vulkanLayers != []) '' - mv -t $drivers/lib $out/lib/libVkLayer* - for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do - substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_" - done - '' - + lib.optionalString haveDozen '' - mkdir -p $spirv2dxil/{bin,lib} - mv -t $spirv2dxil/lib $out/lib/libspirv_to_dxil* - mv -t $spirv2dxil/bin $out/bin/spirv2dxil - ''; - - postFixup = lib.optionalString stdenv.isLinux '' - # set the default search path for DRI drivers; used e.g. by X server - for pc in lib/pkgconfig/{dri,d3d}.pc; do - [ -f "$dev/$pc" ] && substituteInPlace "$dev/$pc" --replace "$drivers" "${libglvnd.driverLink}" - done - - # remove pkgconfig files for GL/EGL; they are provided by libGL. - rm -f $dev/lib/pkgconfig/{gl,egl}.pc - - # Move development files for libraries in $drivers to $driversdev - mkdir -p $driversdev/include - mv $dev/include/xa_* $dev/include/d3d* -t $driversdev/include || true - mkdir -p $driversdev/lib/pkgconfig - for pc in lib/pkgconfig/{xatracker,d3d}.pc; do - if [ -f "$dev/$pc" ]; then - substituteInPlace "$dev/$pc" --replace $out $drivers - mv $dev/$pc $driversdev/$pc - fi - done - - # Don't depend on build python - patchShebangs --host --update $out/bin/* - - # NAR doesn't support hard links, so convert them to symlinks to save space. - jdupes --hard-links --link-soft --recurse "$drivers" - - # add RPATH so the drivers can find the moved libgallium and libdricore9 - # moved here to avoid problems with stripping patchelfed files - for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do - if [[ ! -L "$lib" ]]; then - patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" - fi - done - # add RPATH here so Zink can find libvulkan.so - ${lib.optionalString haveZink '' - patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so - ''} - ''; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin ["-fno-common"] - ++ lib.optionals enableOpenCL [ - "-UPIPE_SEARCH_DIR" - "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" - ]); - - passthru = { - inherit (libglvnd) driverLink; - inherit llvmPackages; - - libdrm = - if withLibdrm - then libdrm - else null; - - tests = lib.optionalAttrs stdenv.isLinux { - devDoesNotDependOnLLVM = stdenv.mkDerivation { - name = "mesa-dev-does-not-depend-on-llvm"; - buildCommand = '' - echo ${self.dev} >>$out - ''; - disallowedRequisites = [llvmPackages.llvm self.drivers]; - }; - }; - }; - - meta = with lib; { - description = "An open source 3D graphics library"; - longDescription = '' - The Mesa project began as an open-source implementation of the OpenGL - specification - a system for rendering interactive 3D graphics. Over the - years the project has grown to implement more graphics APIs, including - OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and - Vulkan. A variety of device drivers allows the Mesa libraries to be used - in many different environments ranging from software emulation to - complete hardware acceleration for modern GPUs. - ''; - homepage = "https://www.mesa3d.org/"; - changelog = "https://www.mesa3d.org/relnotes/${version}.html"; - license = licenses.mit; # X11 variant, in most files - platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [primeos vcunat]; # Help is welcome :) - }; - }; -in - self diff --git a/hacks/orangepi5/mesa/opencl.patch b/hacks/orangepi5/mesa/opencl.patch deleted file mode 100644 index cd27f0a..0000000 --- a/hacks/orangepi5/mesa/opencl.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/meson.build b/meson.build -index fbb0b29322d..b4825056449 100644 ---- a/meson.build -+++ b/meson.build -@@ -1805,7 +1805,7 @@ endif - - dep_clang = null_dep - if with_clc -- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') -+ llvm_libdir = get_option('clang-libdir') - - dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) - -diff --git a/meson_options.txt b/meson_options.txt -index e885ba61a8a..591ed957c85 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -23,6 +23,12 @@ option( - description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY', - ) - -+option( -+ 'clang-libdir', -+ type : 'string', -+ value : '', -+ description : 'Locations to search for clang libraries.' -+) - option( - 'android-stub', - type : 'boolean', -diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 7c14135898e..74dc6850603 100644 ---- a/src/gallium/targets/opencl/meson.build -+++ b/src/gallium/targets/opencl/meson.build -@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') - polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false) - endif - --dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) -+clang_libdir = get_option('clang-libdir') -+dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false) - - # meson will return clang-cpp from system dirs if it's not found in llvm_libdir - linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir) -@@ -123,7 +124,7 @@ if with_opencl_icd - configuration : _config, - input : 'mesa.icd.in', - output : 'mesa.icd', -- install : true, -+ install : false, - install_tag : 'runtime', - install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), - ) -diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build -index b2963fe6dfa..99d6d801b94 100644 ---- a/src/gallium/targets/rusticl/meson.build -+++ b/src/gallium/targets/rusticl/meson.build -@@ -76,7 +76,7 @@ configure_file( - configuration : _config, - input : 'rusticl.icd.in', - output : 'rusticl.icd', -- install : true, -+ install : false, - install_tag : 'runtime', - install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), - ) diff --git a/hacks/orangepi5/uboot/default.nix b/hacks/orangepi5/uboot/default.nix index 7d9ceb2..0e920d6 100644 --- a/hacks/orangepi5/uboot/default.nix +++ b/hacks/orangepi5/uboot/default.nix @@ -39,13 +39,9 @@ in hash = "sha256-0Da7Czy9cpQ+D5EICc3/QSZhAdCBsmeMvBgykYhAQFw="; }; - patches = [./sata.patch]; - defconfig = "orangepi-5-rk3588s_defconfig"; extraConfig = '' CONFIG_ROCKCHIP_SPI_IMAGE=y - CONFIG_SATA=y - CONFIG_CMD_SATA=y ''; ROCKCHIP_TPL = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin"; diff --git a/hosts/op5p/configuration.nix b/hosts/op5p/configuration.nix new file mode 100644 index 0000000..35faea8 --- /dev/null +++ b/hosts/op5p/configuration.nix @@ -0,0 +1,53 @@ +{ + #self, + #lib, + #pkgs, + myData, + #config, + #modulesPath, + ... +}: { + imports = [ + ../../shared/platform/orangepi5.nix + ]; + + users.users = { + motiejus = { + isNormalUser = true; + extraGroups = ["wheel" "video"]; + initialHashedPassword = ""; + openssh.authorizedKeys.keys = [myData.people_pubkeys.motiejus]; + }; + root.initialHashedPassword = ""; + }; + + security = { + pam.services.lightdm.text = '' + auth sufficient pam_succeed_if.so user ingroup wheel + ''; + sudo = { + enable = true; + wheelNeedsPassword = false; + }; + }; + + networking = { + hostName = "op5p"; + domain = "jakstys.lt"; + firewall.allowedTCPPorts = [22]; + }; + + nix = { + extraOptions = '' + experimental-features = nix-command flakes + trusted-users = nixos + ''; + settings = { + experimental-features = ["nix-command" "flakes"]; + trusted-users = ["motiejus"]; + }; + }; + + time.timeZone = "UTC"; + system.stateVersion = "23.11"; +} diff --git a/shared/platform/orangepi5.nix b/shared/platform/orangepi5.nix index 7efa1c7..7047efa 100644 --- a/shared/platform/orangepi5.nix +++ b/shared/platform/orangepi5.nix @@ -2,18 +2,27 @@ config, lib, pkgs, - pkgsHost, - inputs, + modulesPath, ... }: let - crossPkgs = pkgsHost.pkgsCross.aarch64-multiplatform; + crossPkgs = pkgs.pkgsCross.aarch64-multiplatform; in { boot = { kernelPackages = crossPkgs.linuxPackagesFor (crossPkgs.buildLinux { version = "6.8.0-rc1"; modDirVersion = "6.8.0-rc1"; - src = inputs.linux-rockchip-collabora; + #src = linux-rockchip-collabora; + #src = builtins.fetchUrl { + # url = "https://git.jakstys.lt/motiejus/linux/archive/rk3588.tar.gz"; + # sha256 = "869adb5236254e705b51f3bcd22c0ac2498ca661c44c5a25a737bb067bc5a635"; + #}; + src = builtins.fetchGit { + url = "https://git.jakstys.lt/motiejus/linux"; + rev = "eadcef24731e0f1ddb86dc7c9c859387b5b029a2"; + ref = "rk3588"; + shallow = true; + }; kernelPatches = []; extraMeta.branch = "6.8"; @@ -28,27 +37,7 @@ in { consoleLogLevel = 7; }; - hardware = { - deviceTree.name = "rockchip/rk3588s-orangepi-5.dtb"; - - opengl.package = let - mesa = pkgs.callPackage ../../hacks/orangepi5/mesa { - galliumDrivers = ["panfrost"]; - vulkanDrivers = ["panfrost"]; - OpenGL = null; - Xplugin = null; - enableGalliumNine = false; - enableOSMesa = false; - enableVaapi = false; - enableVdpau = false; - enableXa = false; - }; - mesa-panthor = mesa.overrideAttrs (_: { - src = inputs.mesa-panthor; - }); - in - mesa-panthor.drivers; - }; + hardware.deviceTree.name = "rockchip/rk3588s-orangepi-5.dtb"; fileSystems = { "/" = { @@ -59,7 +48,7 @@ in { }; system.build = { - sdImage = import "${inputs.nixpkgs}/nixos/lib/make-disk-image.nix" { + sdImage = import "${modulesPath}/../lib/make-disk-image.nix" { name = "orangepi5-sd-image"; copyChannel = false; inherit config lib pkgs;