From 6b7c57fe456c070981403f31bb6dfcb2ad2a92c3 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 27 Jan 2022 17:20:02 +0100
Subject: dashboard/config/linux: disable deprecated FB configs

Update FD/DRM configs based on Daniel recommendations here:
https://lore.kernel.org/all/YfJ9yWW+MH8N4r4A@phenom.ffwll.local/
---
 dashboard/config/linux/bits/arm64.yml      |  1 -
 dashboard/config/linux/bits/subsystems.yml | 17 +++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'dashboard/config/linux/bits')

diff --git a/dashboard/config/linux/bits/arm64.yml b/dashboard/config/linux/bits/arm64.yml
index 08e950cc6..17d42f594 100644
--- a/dashboard/config/linux/bits/arm64.yml
+++ b/dashboard/config/linux/bits/arm64.yml
@@ -48,7 +48,6 @@ config:
  - DRM_LIMA: n
  - DRM_PANFROST: n
  - DRM_LEGACY: n
- - FB_SMSCUFX: n
  - FB_IBM_GXT4500: n
  - SMS_SIANO_RC: n
  - V4L_PLATFORM_DRIVERS: n
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index cda45a0e6..d7759fb68 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -59,7 +59,6 @@ config:
  - GOOGLE_MEMCONSOLE_X86_LEGACY: n
  - GOOGLE_FIRMWARE: [-s390]
  - GOOGLE_COREBOOT_TABLE: [-s390]
- - GOOGLE_FRAMEBUFFER_COREBOOT: [-s390]
  - GOOGLE_MEMCONSOLE_COREBOOT: [-s390]
  - GOOGLE_VPD: [-s390]
  - KVM: [-arm, -riscv]
@@ -283,16 +282,22 @@ config:
  - DRM_BOCHS
  - DRM_VIRTIO_GPU
  - DRM_CIRRUS_QEMU
+ # Note: SIMPLEDRM driver will be kicked out if we have the real DRM driver enabled
+ # (and we most likely have, see above). So most likely it won't be tested and
+ # and we have separate configs with real drivers and with SIMPLEDRM.
+ - DRM_SIMPLEDRM: [v5.14]
+ - FB
  - FB_TILEBLITTING
- - FB_CIRRUS
+ - FB_CIRRUS: n
  - FB_VGA16: [x86_64]
- - FB_UVESA
+ - FB_UVESA: n
  - FB_VESA: [x86_64]
  - FB_HGA: n
- - FB_I740
- - FB_UDL
+ - FB_I740: n
+ - FB_UDL: n
  - FB_VIRTUAL
- - FB_SIMPLE
+ - FB_SIMPLE: n
+ - FB_SMSCUFX: n
  - VGA_CONSOLE: [x86_64]
  - FRAMEBUFFER_CONSOLE
  - FRAMEBUFFER_CONSOLE_ROTATION
-- 
cgit mrf-deployment