From ee3c76e93ae5f9b9b7e22556961be0b8d65fdfa8 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Thu, 27 May 2021 17:47:29 -0700
Subject: [PATCH] Remove GPU module and firmware from ramdisk

They aren't needed for first-stage boot, and can be loaded from
`/vendor` and `/vendor_dlkm`.

Bug: 189506395
Test: boot to home
Change-Id: Ib4c708c8631586cf25e1535035b8bc81f727ef5f
---
 BoardConfig-common.mk | 1 +
 device.mk             | 2 +-
 init.insmod.gs201.cfg | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ed27a23b..54992e3f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -378,6 +378,7 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES_FILTER += \
     $(TARGET_KERNEL_DIR)/bcmdhd43752.ko \
     $(TARGET_KERNEL_DIR)/bcmdhd4389.ko \
     $(TARGET_KERNEL_DIR)/lwis.ko \
+    $(TARGET_KERNEL_DIR)/mali_kbase.ko \
     $(TARGET_KERNEL_DIR)/pinctrl-slg51000.ko \
     $(TARGET_KERNEL_DIR)/pktgen.ko \
     $(TARGET_KERNEL_DIR)/slg51000-core.ko \
diff --git a/device.mk b/device.mk
index 39f300d5..6007ca8f 100644
--- a/device.mk
+++ b/device.mk
@@ -145,7 +145,7 @@ PRODUCT_SOONG_NAMESPACES += \
        vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader
 
 PRODUCT_PACKAGES += \
-       mali_csffw.bin-ramdisk \
+       mali_csffw.bin \
        libGLES_mali-gs201-prebuilt \
        vulkan.gs201-prebuilt \
 #        libOpenCL \
diff --git a/init.insmod.gs201.cfg b/init.insmod.gs201.cfg
index f5d9d642..0ba13577 100644
--- a/init.insmod.gs201.cfg
+++ b/init.insmod.gs201.cfg
@@ -25,6 +25,7 @@ modprobe|slg51000-core.ko
 modprobe|slg51000-regulator.ko
 modprobe|pinctrl-slg51000.ko
 modprobe|lwis.ko
+modprobe|mali_kbase.ko
 modprobe|stmvl53l1.ko
 modprobe|st21nfc.ko
 # All common modules loaded