[SRU][Eoan][raspi2][PATCH 1/1] UBUNTU: [config] raspi2: Revert "UBUNTU: [config] raspi2: CONFIG_DRM_V3D=m"

[Hui Wang]

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

The driver v3d is not stable, even the branch rpi-5.3.y doesn't have a
stable v3d driver yet. Let us disable it in the kernel, otherwise
the driver will crash when users operate something under desktop.

We will enable it again after getting the perfect fixes from upstream
and doing enough tests.

This reverts commit f318b05e384816138f88a78bd7a299f51c986342.

Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
 debian.raspi2/config/annotations          | 1 -
 debian.raspi2/config/config.common.ubuntu | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations
index a017e28ea1b1..6c481de85421 100644
--- a/debian.raspi2/config/annotations
+++ b/debian.raspi2/config/annotations
@@ -1542,7 +1542,6 @@ CONFIG_DRM_TEGRA                                policy<{'armhf-generic': 'm'}>
 CONFIG_DRM_TEGRA_DEBUG                          policy<{'armhf-generic': 'n'}>
 CONFIG_DRM_TEGRA_STAGING                        policy<{'armhf-generic': 'y'}>
 CONFIG_DRM_STI                                  policy<{'armhf': 'n'}>
-CONFIG_DRM_V3D                                  policy<{'arm64': 'm', 'armhf': 'm'}>note<LP:1850876>
 CONFIG_DRM_VC4                                  policy<{'arm64': 'm'}>
 CONFIG_DRM_ETNAVIV                              policy<{'armhf-generic': 'm'}>
 CONFIG_DRM_ETNAVIV_REGISTER_LOGGING             policy<{'armhf-generic': 'n'}>
diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 0422f5901067..dc1ff1f98c86 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -1837,7 +1837,7 @@ CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TTM=m
 CONFIG_DRM_TVE200=m
 CONFIG_DRM_UDL=m
-CONFIG_DRM_V3D=m
+# CONFIG_DRM_V3D is not set
 CONFIG_DRM_VC4=m
 # CONFIG_DRM_VC4_HDMI_CEC is not set
 CONFIG_DRM_VGEM=m
-- 
2.17.1