4749e2e703
The firmware files ended up in linux-firmware, and https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=dbc294d3e49aa63a61bb4026b5784bae5b75aa2b moved them to a ipu/ subpath, so update our patches to find them there, and stop using the pkgs.ipu6-camera-bins package. https://github.com/NixOS/nixpkgs/pull/290216 bumped our linux-firmware image past this, so this should work for people tracking nixos-unstable. Change-Id: Ic3eb9fb364c93ee0d10951451a59f7e98888b5d7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11097 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
70 lines
3.1 KiB
Nix
70 lines
3.1 KiB
Nix
{ pkgs, lib, ... }:
|
|
|
|
let
|
|
libcamera = pkgs.libcamera.overrideAttrs (old: {
|
|
mesonFlags = old.mesonFlags or [ ] ++ [
|
|
"-Dpipelines=simple/simple,ipu3,uvcvideo"
|
|
"-Dipas=simple/simple,ipu3"
|
|
];
|
|
|
|
# This is
|
|
# https://copr-dist-git.fedorainfracloud.org/cgit/jwrdegoede/ipu6-softisp/libcamera.git/plain/libcamera-0.2.0-softisp.patch?h=f39&id=60e6b3d5e366a360a75942073dc0d642e4900982,
|
|
# but manually piped to git and back, as some renames were not processed properly.
|
|
patches = old.patches or [ ] ++ [
|
|
./libcamera/0001-libcamera-pipeline-simple-fix-size-adjustment-in-val.patch
|
|
./libcamera/0002-libcamera-internal-Move-dma_heaps.-h-cpp-to-common-d.patch
|
|
./libcamera/0003-libcamera-dma_heaps-extend-DmaHeap-class-to-support-.patch
|
|
./libcamera/0004-libcamera-internal-Move-SharedMemObject-class-to-a-c.patch
|
|
./libcamera/0005-libcamera-internal-Document-the-SharedMemObject-clas.patch
|
|
./libcamera/0006-libcamera-introduce-SoftwareIsp-class.patch
|
|
./libcamera/0007-libcamera-software_isp-Add-SwStats-base-class.patch
|
|
./libcamera/0008-libcamera-software_isp-Add-SwStatsCpu-class.patch
|
|
./libcamera/0009-libcamera-software_isp-Add-Debayer-base-class.patch
|
|
./libcamera/0010-libcamera-software_isp-Add-DebayerCpu-class.patch
|
|
./libcamera/0011-libcamera-ipa-add-Soft-IPA-common-files.patch
|
|
./libcamera/0012-libcamera-ipa-Soft-IPA-add-a-Simple-Soft-IPA-impleme.patch
|
|
./libcamera/0013-libcamera-software_isp-add-Simple-SoftwareIsp-implem.patch
|
|
./libcamera/0014-libcamera-pipeline-simple-rename-converterBuffers_-a.patch
|
|
./libcamera/0015-libcamera-pipeline-simple-enable-use-of-Soft-ISP-and.patch
|
|
./libcamera/0016-libcamera-swstats_cpu-Add-support-for-8-10-and-12-bp.patch
|
|
./libcamera/0017-libcamera-debayer_cpu-Add-support-for-8-10-and-12-bp.patch
|
|
./libcamera/0018-libcamera-debayer_cpu-Add-BGR888-output-support.patch
|
|
./libcamera/0019-libcamera-pipeline-simple-Enable-simplepipeline-for-.patch
|
|
./libcamera/0020-libcamera-Add-support-for-IGIG_GBGR_IGIG_GRGB-bayer-.patch
|
|
./libcamera/0021-libcamera-swstats_cpu-Add-support-for-10bpp-IGIG_GBG.patch
|
|
./libcamera/0022-libcamera-debayer_cpu-Add-support-for-10bpp-IGIG_GBG.patch
|
|
./libcamera/0023-libcamera-Add-Software-ISP-benchmarking-documentatio.patch
|
|
./libcamera/0024-ov01a1s-HACK.patch
|
|
./libcamera/0025-libcamera-debayer_cpu-Make-the-minimum-size-1280x720.patch
|
|
];
|
|
});
|
|
|
|
# use patched libcamera
|
|
pipewire' = (pkgs.pipewire.override {
|
|
inherit libcamera;
|
|
});
|
|
|
|
wireplumber' = (pkgs.wireplumber.override {
|
|
pipewire = pipewire';
|
|
});
|
|
in
|
|
{
|
|
boot.kernelPatches = [{
|
|
name = "linux-kernel-test.patch";
|
|
patch = ./kernel/softisp.patch;
|
|
extraStructuredConfig = {
|
|
# needed for /dev/dma_heap
|
|
DMABUF_HEAPS_CMA = lib.kernel.yes;
|
|
DMABUF_HEAPS_SYSTEM = lib.kernel.yes;
|
|
DMABUF_HEAPS = lib.kernel.yes;
|
|
};
|
|
}];
|
|
|
|
|
|
services.udev.extraRules = ''
|
|
KERNEL=="system", SUBSYSTEM=="dma_heap", TAG+="uaccess"
|
|
'';
|
|
|
|
services.pipewire.package = pipewire';
|
|
services.pipewire.wireplumber.package = wireplumber';
|
|
}
|