[SRU][J/raspi][PATCH] UBUNTU: [Config] raspi: Disable DRM_SIMPLEDRM and set FB_SIMPLE=y

[Juerg Haefliger]

BugLink: https://bugs.launchpad.net/bugs/1976147

Some older (?) monitors/cables don't show the kernel boot messages when
'quiet' and 'splash' are removed from the commandline until the kernel
switches to the vc4drmfb frame buffer device. Building the simplefb module
into the kernel (like raspberrypi does) fixes that.

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 debian.raspi/abi/arm64/raspi.modules        | 1 -
 debian.raspi/abi/armhf/raspi-nolpae.modules | 1 -
 debian.raspi/abi/armhf/raspi.modules        | 1 -
 debian.raspi/config/annotations             | 2 ++
 debian.raspi/config/config.common.ubuntu    | 4 ++--
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian.raspi/abi/arm64/raspi.modules b/debian.raspi/abi/arm64/raspi.modules
index 7f046787ac65..c8fb8b23ea62 100644
--- a/debian.raspi/abi/arm64/raspi.modules
+++ b/debian.raspi/abi/arm64/raspi.modules
@@ -4032,7 +4032,6 @@ sil164
 silead
 simple-bridge
 simple-mfd-i2c
-simpledrm
 simplefb
 siox-core
 sir_ir
diff --git a/debian.raspi/abi/armhf/raspi-nolpae.modules b/debian.raspi/abi/armhf/raspi-nolpae.modules
index b24e741390cb..ec5f4cd0202f 100644
--- a/debian.raspi/abi/armhf/raspi-nolpae.modules
+++ b/debian.raspi/abi/armhf/raspi-nolpae.modules
@@ -4043,7 +4043,6 @@ sil164
 silead
 simple-bridge
 simple-mfd-i2c
-simpledrm
 simplefb
 siox-core
 sir_ir
diff --git a/debian.raspi/abi/armhf/raspi.modules b/debian.raspi/abi/armhf/raspi.modules
index 2ccdaa498618..fbf6bbed0728 100644
--- a/debian.raspi/abi/armhf/raspi.modules
+++ b/debian.raspi/abi/armhf/raspi.modules
@@ -4044,7 +4044,6 @@ sil164
 silead
 simple-bridge
 simple-mfd-i2c
-simpledrm
 simplefb
 siox-core
 sir_ir
diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
index c23b50617591..77ebacd80105 100644
--- a/debian.raspi/config/annotations
+++ b/debian.raspi/config/annotations
@@ -4,6 +4,8 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_FB_SIMPLE				policy<{'*': 'y'}> mark<ENFORCED> note<LP: #1976147>
+
 CONFIG_VIRTIO_PCI				policy<{'*': 'm'}> mark<ENFORCED> note<LP: #1959102>
 
 CONFIG_MFD_RASPBERRYPI_POE_HAT			policy<{'*': 'm'}> mark<ENFORCED> note<LP: #1958854>
diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index 577c11d2bceb..8631028e0e18 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -2131,7 +2131,7 @@ CONFIG_DRM_SCHED=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_SII9234=m
 CONFIG_DRM_SIL_SII8620=m
-CONFIG_DRM_SIMPLEDRM=m
+# CONFIG_DRM_SIMPLEDRM is not set
 CONFIG_DRM_SIMPLE_BRIDGE=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_STM is not set
@@ -2561,7 +2561,7 @@ CONFIG_FB_S3_DDC=y
 CONFIG_FB_SAVAGE=m
 # CONFIG_FB_SAVAGE_ACCEL is not set
 CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SIMPLE=m
+CONFIG_FB_SIMPLE=y
 CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-- 
2.34.1