[SRU][K][PATCH 11/16] UBUNTU: [Config] Enable CONFIG_DRM_AMD_DC_SI on riscv64

[Emil Renner Berthing]

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

This option was not annotated in the linux-riscv tree, so let's align it
with the other architectures.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at 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 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f8101b7e02e0..641f803a2af2 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -90,7 +90,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DNET=m
 CONFIG_DP83TD510_PHY=m
 CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_CIRRUS_QEMU=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 130551ffdba0..31caa142edee 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2226,7 +2226,7 @@ CONFIG_DRM_AMD_ACP                              policy<{'amd64': 'y', 'arm64': '
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU >> Display Engine Configuration
 CONFIG_DRM_AMD_DC                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_DRM_AMD_DC_HDCP                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
-CONFIG_DRM_AMD_DC_SI                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n'}>
+CONFIG_DRM_AMD_DC_SI                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_DEBUG_KERNEL_DC                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}>
 CONFIG_DRM_AMD_SECURE_DISPLAY                   policy<{'amd64': 'y', 'ppc64el': 'y'}>
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index a5e25181fd2f..0eb9d12d70f5 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -98,7 +98,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DNET=m
 CONFIG_DP83TD510_PHY=m
 CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_CIRRUS_QEMU=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 85a695b750f7..10000c988072 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -91,7 +91,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DNET=m
 CONFIG_DP83TD510_PHY=m
 CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_CIRRUS_QEMU=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index dcaf1a1cedc1..d8224d2a3941 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2917,6 +2917,7 @@ CONFIG_DRM_AMD_ACP=y
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN=y
 CONFIG_DRM_AMD_DC_HDCP=y
+CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_AMD_SECURE_DISPLAY=y
 CONFIG_DRM_ANALOGIX_ANX6345=m
 CONFIG_DRM_ANALOGIX_ANX7625=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 815177cf84bf..828701c40997 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -90,7 +90,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DNET=m
 CONFIG_DP83TD510_PHY=m
 CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_CIRRUS_QEMU=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 77aecd8bf41d..8f7dabb14e89 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -88,7 +88,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DNET=m
 CONFIG_DP83TD510_PHY=m
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMD_DC_SI is not set
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_CIRRUS_QEMU=m
-- 
2.36.1