colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

moby: disable CMA/DMABUF config options

Browse Source 
works: display
works: torch / LED
works: rear camera (via megapixels-next)
works: speakers
works: headphones
This commit is contained in:
Colin
2024-09-19 03:27:38 +00:00
parent 378168776a
commit d8b9f58788
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/additional/linux-armbian/default.nix
View File

@@ -669,21 +669,21 @@ linux.override {
extraStructuredConfig = with lib.kernel; { extraStructuredConfig = with lib.kernel; {
# borrowed from postmarketOS, "to enable libcamera development" # borrowed from postmarketOS, "to enable libcamera development"
# pmaports commit f18c7210ab # pmaports commit f18c7210ab
DMABUF_HEAPS = yes; # DMABUF_HEAPS = yes;
DMABUF_HEAPS_CMA = yes; # DMABUF_HEAPS_CMA = yes;
# borrowed from postmarketOS, speculatively, as i debug megapixels camera # borrowed from postmarketOS, speculatively, as i debug megapixels camera
# CMA_AREAS = "CMA allows to create CMA areas for particular purpose, mainly, used as device private area." # CMA_AREAS = "CMA allows to create CMA areas for particular purpose, mainly, used as device private area."
# "If unsure, leave the default value "8" in UMA and "20" in NUMA." # "If unsure, leave the default value "8" in UMA and "20" in NUMA."
# - pinephone in mainline linux, postmarketOS, defaults to 7 # - pinephone in mainline linux, postmarketOS, defaults to 7
# - nixos defaults to ... 19? # - nixos defaults to ... 19?
CMA_AREAS = freeform "7"; # CMA_AREAS = freeform "7";
# DRM_ACCEL = lib.mkForce no; # DRM_ACCEL = lib.mkForce no;
# CMA_SIZE_MBYTES = lib.mkForce (freeform "256"); #< also available at boot time via `cma=256M` CLI # CMA_SIZE_MBYTES = lib.mkForce (freeform "256"); #< also available at boot time via `cma=256M` CLI
# #vvv aside from SUN50I_IOMMU, this is just upgrading modules to `y` # #vvv aside from SUN50I_IOMMU, this is just upgrading modules to `y`
# DMA_SUN6I = yes; # DMA_SUN6I = yes;
SUN50I_IOMMU = yes; # SUN50I_IOMMU = yes;
# VIDEOBUF2_CORE = yes; # VIDEOBUF2_CORE = yes;
# VIDEOBUF2_V4L2 = yes; # VIDEOBUF2_V4L2 = yes;
# VIDEOBUF2_MEMOPS = yes; # VIDEOBUF2_MEMOPS = yes;
@@ -692,7 +692,6 @@ linux.override {
VIDEO_SUNXI = yes; VIDEO_SUNXI = yes;
# VIDEO_SUNXI_CEDRUS = yes; # VIDEO_SUNXI_CEDRUS = yes;
# # VIDEO_SUNXI_CEDRUS = module; #< implied by VIDEO_SUNXI # # VIDEO_SUNXI_CEDRUS = module; #< implied by VIDEO_SUNXI
# #^^^ this isn't enough to get camera working
# MFD_SUN6I_PRCM = yes; # MFD_SUN6I_PRCM = yes;