@@ -82,7 +82,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_DP_CEC=y
# CONFIG_DRM_ETNAVIV is not set
-CONFIG_DRM_HISI_HIBMC=m
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA9950=m
CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -1814,7 +1814,7 @@ CONFIG_DRM_VC4_HDMI_CEC policy<{'arm64': 'y'}>
CONFIG_DRM_ETNAVIV policy<{'amd64': 'n', 'arm64': 'm', 'armhf': 'm', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
CONFIG_DRM_ETNAVIV_THERMAL policy<{'arm64': 'y', 'armhf': 'y'}>
CONFIG_DRM_ARCPGU policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_DRM_HISI_HIBMC policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
+CONFIG_DRM_HISI_HIBMC policy<{'arm64': 'm'}>
CONFIG_DRM_HISI_KIRIN policy<{'arm64': 'm'}>
CONFIG_HISI_KIRIN_DW_DSI policy<{'arm64': 'm'}>
CONFIG_DRM_MEDIATEK policy<{'arm64': 'm', 'armhf': 'm'}>
@@ -92,7 +92,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_DP_CEC=y
CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_HISI_HIBMC=m
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA9950=m
CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -83,7 +83,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_DP_CEC=y
CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_HISI_HIBMC=m
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA9950=m
CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -2480,6 +2480,7 @@ CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
CONFIG_DRM_HDLCD=m
# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
+CONFIG_DRM_HISI_HIBMC=m
CONFIG_DRM_HISI_KIRIN=m
CONFIG_DRM_I2C_ADV7511=m
CONFIG_DRM_I2C_ADV7511_AUDIO=y
@@ -79,7 +79,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_DP_CEC=y
# CONFIG_DRM_ETNAVIV is not set
-CONFIG_DRM_HISI_HIBMC=m
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA9950=m
CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -78,7 +78,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_DP_AUX_CHARDEV=y
CONFIG_DRM_DP_CEC=y
# CONFIG_DRM_ETNAVIV is not set
-CONFIG_DRM_HISI_HIBMC=m
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA9950=m
CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -69,7 +69,6 @@ CONFIG_DM_DEBUG=y
# CONFIG_DRM_DP_AUX_CHARDEV is not set
# CONFIG_DRM_DP_CEC is not set
# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_HISI_HIBMC is not set
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_NXP_TDA9950 is not set
# CONFIG_DRM_I2C_NXP_TDA998X is not set
BugLink: https://bugs.launchpad.net/bugs/1762940 Hisilicon say that the hibmc_drm driver is for use on arm64 arch only, and is not meant for amd64. When hibmc_drm is used with amd64 hardware, multiple issues occur which lead to the screen being unreadable, most significant is the inability to use the d-i server installer due to the problem. This patch removes CONFIG_DRM_HISI_HIBMC from all architectures other than arm64. Signed-off-by: Matthew Ruffell <matthew.ruffell@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/i386/config.common.i386 | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 8 files changed, 2 insertions(+), 7 deletions(-)