From 05b451c563240666457c0269a4d348859c8103b9 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Wed, 6 Oct 2021 11:15:35 +0200
Subject: [PATCH] pkg/mesa_gpu: use cached_fs_rom

By using the cached_fs_rom instead of fs_rom, each client obtains the
same (read-only) copy of the shared library, avoiding a RAM resource
request when running mulitple GPU applications at the same time.
With this patch, Sculpt is able to host at least 3 Mesa applications.

Issue #4263
Issue #4281
---
 repos/libports/recipes/pkg/mesa_gpu-cpu/archives   |  2 +-
 repos/libports/recipes/pkg/mesa_gpu-cpu/runtime    | 12 +++++++++---
 repos/libports/recipes/pkg/mesa_gpu-intel/archives |  2 +-
 repos/libports/recipes/pkg/mesa_gpu-intel/runtime  | 12 +++++++++---
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/repos/libports/recipes/pkg/mesa_gpu-cpu/archives b/repos/libports/recipes/pkg/mesa_gpu-cpu/archives
index 44a9b36b76..f548df6f3e 100644
--- a/repos/libports/recipes/pkg/mesa_gpu-cpu/archives
+++ b/repos/libports/recipes/pkg/mesa_gpu-cpu/archives
@@ -1,4 +1,4 @@
-_/src/fs_rom
+_/src/cached_fs_rom
 _/src/init
 _/src/mesa
 _/src/vfs
diff --git a/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime b/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime
index f86207d993..4ce5e6b8fb 100644
--- a/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime
+++ b/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime
@@ -4,9 +4,13 @@
 		<rom/>
 	</provides>
 
+	<requires>
+		<rm/>
+	</requires>
+
 	<content>
 		<rom label="mesa_gpu-softpipe.lib.so"/>
-		<rom label="fs_rom"/>
+		<rom label="cached_fs_rom"/>
 		<rom label="init"/>
 		<rom label="vfs"/>
 		<rom label="vfs.lib.so"/>
@@ -15,7 +19,9 @@
 	<config>
 
 		<service name="ROM">
-			<default-policy> <child name="fs_rom" label="mesa_gpu-softpipe.lib.so"/> </default-policy>
+			<default-policy>
+				<child name="cached_fs_rom" label="mesa_gpu-softpipe.lib.so"/>
+			</default-policy>
 		</service>
 
 		<parent-provides>
@@ -39,7 +45,7 @@
 			</config>
 		</start>
 
-		<start name="fs_rom" caps="100">
+		<start name="cached_fs_rom" caps="100">
 			<resource name="RAM" quantum="2M"/>
 			<provides> <service name="ROM"/> </provides>
 			<config/>
diff --git a/repos/libports/recipes/pkg/mesa_gpu-intel/archives b/repos/libports/recipes/pkg/mesa_gpu-intel/archives
index 44a9b36b76..f548df6f3e 100644
--- a/repos/libports/recipes/pkg/mesa_gpu-intel/archives
+++ b/repos/libports/recipes/pkg/mesa_gpu-intel/archives
@@ -1,4 +1,4 @@
-_/src/fs_rom
+_/src/cached_fs_rom
 _/src/init
 _/src/mesa
 _/src/vfs
diff --git a/repos/libports/recipes/pkg/mesa_gpu-intel/runtime b/repos/libports/recipes/pkg/mesa_gpu-intel/runtime
index d3015d9f56..c3049fa4c3 100644
--- a/repos/libports/recipes/pkg/mesa_gpu-intel/runtime
+++ b/repos/libports/recipes/pkg/mesa_gpu-intel/runtime
@@ -4,9 +4,13 @@
 		<rom/>
 	</provides>
 
+	<requires>
+		<rm/>
+	</requires>
+
 	<content>
 		<rom label="mesa_gpu-iris.lib.so"/>
-		<rom label="fs_rom"/>
+		<rom label="cached_fs_rom"/>
 		<rom label="init"/>
 		<rom label="vfs"/>
 		<rom label="vfs.lib.so"/>
@@ -15,7 +19,9 @@
 	<config verbose="yes">
 
 		<service name="ROM">
-			<default-policy> <child name="fs_rom" label="mesa_gpu-iris.lib.so"/> </default-policy>
+			<default-policy>
+				<child name="cached_fs_rom" label="mesa_gpu-iris.lib.so"/>
+			</default-policy>
 		</service>
 
 		<parent-provides>
@@ -39,7 +45,7 @@
 			</config>
 		</start>
 
-		<start name="fs_rom" caps="100">
+		<start name="cached_fs_rom" caps="100">
 			<resource name="RAM" quantum="9M"/>
 			<provides> <service name="ROM"/> </provides>
 			<config/>