From 4fb1ebb6a2b05110c819f607d8a5ee6c3837f633 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 30 May 2021 00:45:44 -0400
Subject: [PATCH] Change efifb workaround method

That method lets us use the unpatched NixOS kernel freely! yay!
---
 README.md                 | 8 ++++----
 kernel/latest/default.nix | 8 --------
 kernel/lts/default.nix    | 8 --------
 pinebook_pro.nix          | 5 +++++
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 1da2859..48f5166 100644
--- a/README.md
+++ b/README.md
@@ -29,11 +29,11 @@ What's untested and not working will be listed here at some point. Maybe.
 
 #### `rockchipdrm` and `efifb`
 
-`CONFIG_FB_EFI` has been disabled in the customized kernel as `rockchipdrm`
-will not render the VT if `efifb` is present.
+This can be worked around by booting with the `efifb=off` kernel command-line.
 
-Be careful if using the mainline kernel instead, as it will have
-`CONFIG_FB_EFI` set to `y`.
+This is already handled for you by this configuration. If using the generic
+UEFI AArch64 iso, you will need to add the option yourself to the command-line
+using GRUB.
 
 #### *EFI* and poweroff
 
diff --git a/kernel/latest/default.nix b/kernel/latest/default.nix
index 93f279d..1c0cd28 100644
--- a/kernel/latest/default.nix
+++ b/kernel/latest/default.nix
@@ -46,14 +46,6 @@ linux_latest.override({
         VIDEO_HANTRO_ROCKCHIP y
       '';
     }
-    {
-      # When efifb is used, rockchipdrm won't render the VT.
-      name = "rk3399-efifb-config";
-      patch = null;
-      extraConfig = ''
-        FB_EFI n
-      '';
-    }
 
     # Misc. community patches
     # None are *required* for basic function.
diff --git a/kernel/lts/default.nix b/kernel/lts/default.nix
index 250c26c..1a3249b 100644
--- a/kernel/lts/default.nix
+++ b/kernel/lts/default.nix
@@ -46,14 +46,6 @@ linux_5_10.override({
         VIDEO_HANTRO_ROCKCHIP y
       '';
     }
-    {
-      # When efifb is used, rockchipdrm won't render the VT.
-      name = "rk3399-efifb-config";
-      patch = null;
-      extraConfig = ''
-        FB_EFI n
-      '';
-    }
 
     # Misc. community patches
     # None are *required* for basic function.
diff --git a/pinebook_pro.nix b/pinebook_pro.nix
index 334598a..0523185 100644
--- a/pinebook_pro.nix
+++ b/pinebook_pro.nix
@@ -41,6 +41,11 @@
     "rtc_rk808"
   ];
 
+  boot.kernelParams = [
+    # Works around an issue with efifb, U-Boot and RK3399
+    "efifb=off"
+  ];
+
   services.udev.extraHwdb = lib.concatStrings [
     # https://gitlab.manjaro.org/manjaro-arm/packages/community/pinebookpro-post-install/blob/master/10-usb-kbd.hwdb
     ''