From 2f755fb3faedaba076dee03678ef0e7e7d9e6caa Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Wed, 16 Mar 2022 13:24:26 +0100
Subject: [PATCH] UBUNTU: [Config] disable CONFIG_SYSFB_SIMPLEFB on amd64

CONFIG_SYSFB_SIMPLEFB was confirmed to break the fb on several x86-64
kits, disable it for now.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 +
 debian.master/config/annotations               | 2 +-
 debian.master/config/arm64/config.common.arm64 | 1 +
 debian.master/config/armhf/config.common.armhf | 1 +
 debian.master/config/config.common.ubuntu      | 1 -
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 08942907afaa..2c885fe163cc 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -605,6 +605,7 @@ CONFIG_SUN_PARTITION=y
 CONFIG_SURFACE_3_BUTTON=m
 CONFIG_SURFACE_3_POWER_OPREGION=m
 CONFIG_SURFACE_PRO3_BUTTON=m
+# CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 9422a0698bcc..5674cbdfde4a 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11131,7 +11131,7 @@ CONFIG_INTEL_STRATIX10_SERVICE                  policy<{'arm64': 'm'}>
 CONFIG_INTEL_STRATIX10_RSU                      policy<{'arm64': 'm'}>
 CONFIG_QCOM_SCM                                 policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT           policy<{'arm64': 'n', 'armhf': 'n'}>
-CONFIG_SYSFB_SIMPLEFB                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y'}>
+CONFIG_SYSFB_SIMPLEFB                           policy<{'amd64': 'n', 'arm64': 'y', 'armhf': 'y'}>
 CONFIG_TI_SCI_PROTOCOL                          policy<{'arm64': 'y'}>
 CONFIG_TRUSTED_FOUNDATIONS                      policy<{'armhf': 'y'}>
 CONFIG_TURRIS_MOX_RWTM                          policy<{'arm64': 'm', 'armhf': 'm'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index f0cd2a65580c..11eb91570b19 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -624,6 +624,7 @@ CONFIG_SUN_PARTITION=y
 # CONFIG_SURFACE_3_BUTTON is not set
 # CONFIG_SURFACE_3_POWER_OPREGION is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
+CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 089c5b797714..6d830cccd8e6 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -607,6 +607,7 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_SUN_PARTITION=y
+CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3bc53d3f041e..c709acfc6e17 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -11091,7 +11091,6 @@ CONFIG_SYSC_RCAR=y
 CONFIG_SYSC_RCAR_GEN4=y
 CONFIG_SYSC_RMOBILE=y
 CONFIG_SYSFB=y
-CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSFS_SYSCALL=y