Merge pull request #9363 from HiassofT/le13-rpi5-cma

RPi5: reduce CMA memory
This commit is contained in:
Jernej Škrabec 2024-10-05 16:26:18 +02:00 committed by GitHub
commit c5f16b92cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 31 additions and 2 deletions

View File

@ -7,7 +7,7 @@ arm_64bit=1
kernel=kernel.img
display_auto_detect=1
enable_tvout=1
dtoverlay=vc4-kms-v3d,cma-512,composite=1
dtoverlay=vc4-kms-v3d,cma-64,composite=1
dtoverlay=
disable_overscan=1
disable_fw_kms_setup=1

View File

@ -6,7 +6,7 @@ arm_boost=1
arm_64bit=1
kernel=kernel.img
display_auto_detect=1
dtoverlay=vc4-kms-v3d,cma-512
dtoverlay=vc4-kms-v3d,cma-64
dtoverlay=
disable_overscan=1
disable_fw_kms_setup=1

View File

@ -0,0 +1 @@
SUBSYSTEM=="dma_heap", KERNEL=="system", SYMLINK+="dma_heap/vidbuf_cached"

View File

@ -0,0 +1,28 @@
From 863283c15dbba77a50f93640f77630052aef0cc5 Mon Sep 17 00:00:00 2001
From: Dom Cobley <popcornmix@gmail.com>
Date: Wed, 31 Jul 2024 14:23:46 +0100
Subject: [PATCH] DMAHeapBufferObject: Add vidbuf_cached
This is an optional symlink that allows preferring system or cma for dmabuf allocations
(typically system for pi5 and cma for pi4)
---
xbmc/utils/DMAHeapBufferObject.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xbmc/utils/DMAHeapBufferObject.cpp b/xbmc/utils/DMAHeapBufferObject.cpp
index ad05aa8290ac..d6457318b45e 100644
--- a/xbmc/utils/DMAHeapBufferObject.cpp
+++ b/xbmc/utils/DMAHeapBufferObject.cpp
@@ -24,7 +24,8 @@
namespace
{
-std::array<const char*, 3> DMA_HEAP_PATHS = {
+std::array<const char*, 4> DMA_HEAP_PATHS = {
+ "/dev/dma_heap/vidbuf_cached",
"/dev/dma_heap/reserved",
"/dev/dma_heap/linux,cma",
"/dev/dma_heap/system",
--
2.39.2