From 30b3ad218f2ec62dd2dabc7efc7508784ad85daf Mon Sep 17 00:00:00 2001
From: Piotr Tworek <tworaz@tworaz.net>
Date: Tue, 16 Nov 2021 18:40:29 +0100
Subject: [PATCH] virt_qemu: Use VirtIO fb driver instead of ramfb.

This driver should be better suited for VirtIO based board like
qemu_virt.
---
 repos/base/board/virt_qemu/qemu_args          |  2 +-
 .../drivers_interactive-virt_qemu/archives    |  2 +-
 .../drivers.config                            | 36 ++++++-------------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/repos/base/board/virt_qemu/qemu_args b/repos/base/board/virt_qemu/qemu_args
index a408874c66..2d21c33626 100644
--- a/repos/base/board/virt_qemu/qemu_args
+++ b/repos/base/board/virt_qemu/qemu_args
@@ -3,7 +3,7 @@
 -device virtio-net-device,bus=virtio-mmio-bus.0,netdev=net0
 -device virtio-mouse-device
 -device virtio-keyboard-device
--device ramfb
+-device virtio-gpu-device
 -netdev user,id=net0
 arm_v8a: -M virt,virtualization=true,gic-version=3 -cpu cortex-a53 -smp 4
 arm_v7a: -M virt,virtualization=true -cpu cortex-a15 -smp 2
diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives b/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
index adda6741bc..9b392ccf04 100644
--- a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
+++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
@@ -1,4 +1,4 @@
-_/src/virt_qemu_drivers
+_/src/virtio_fb_drv
 _/src/virtio_input_drv
 _/src/platform_drv
 _/src/event_filter
diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config b/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config
index 3bb745891e..8497665dde 100644
--- a/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config
+++ b/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config
@@ -18,15 +18,8 @@
 		<provides> <service name="ROM"/> </provides>
 		<route> <any-service> <parent/> </any-service> </route>
 		<config>
-
-			<!-- device resource declarations -->
-			<device name="fw-cfg" type="qemu,fw-cfg-mmio">
-				<io_mem address="0x9020000" size="0x1000"/>
-			</device>
-
-			<!-- policy part, who owns which devices -->
-			<policy label="fb_drv -> " info="yes">
-				<device name="fw-cfg"/>
+			<policy label_prefix="virtio_fb_drv" info="yes">
+				<device name="gpu0"/>
 			</policy>
 			<policy label_prefix="virtio_keyboard_drv" info="yes">
 				<device name="input0"/>
@@ -48,22 +41,6 @@
 		</route>
 	</start>
 
-	<start name="fb_drv">
-		<binary name="ram_fb_drv"/>
-		<resource name="RAM" quantum="8M"/>
-		<route>
-			<service name="Platform">
-				<child name="platform_drv"/>
-			</service>
-			<service name="ROM">     <parent/> </service>
-			<service name="PD">      <parent/> </service>
-			<service name="CPU">     <parent/> </service>
-			<service name="LOG">     <parent/> </service>
-			<service name="Timer">   <parent/> </service>
-			<service name="Capture"> <parent/> </service>
-		</route>
-	</start>
-
 	<start name="event_filter" caps="90">
 		<resource name="RAM" quantum="1280K"/>
 		<provides> <service name="Event"/> </provides>
@@ -108,4 +85,13 @@
 		</route>
 	</start>
 
+	<start name="virtio_fb_drv" caps="120">
+		<binary name="virtio_mmio_fb_drv"/>
+		<resource name="RAM" quantum="50M"/>
+		<route>
+			<service name="Platform"> <child name="platform_drv"/> </service>
+			<any-service> <parent/> </any-service>
+		</route>
+	</start>
+
 </config>