From patchwork Tue Jul 16 01:09:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1132390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45nj4Y4mrmz9sND; Tue, 16 Jul 2019 11:10:21 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hnBz0-0005OI-6u; Tue, 16 Jul 2019 01:10:18 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hnByz-0005Nu-7t for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:10:17 +0000 Received: from mail-pg1-f197.google.com ([209.85.215.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hnByy-0006G4-P5 for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:10:16 +0000 Received: by mail-pg1-f197.google.com with SMTP id d187so11532431pga.7 for ; Mon, 15 Jul 2019 18:10:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=entxSUyOIfyYXNcWD1O2o7odilRYRCz8rYg3mUHc4OQ=; b=OzpZj7hGmnHnBgMxgZuCQBgh+iDneRLXOpk1Ecf4CXVxx+xEeB+VIgG8HBjwbgH5DS YrmB7LiOcmCHwoE6RiyvbMKPyskGB/a4EwSFVOxyvmdqRBZGqwSITZOnGB4TrRhITzY7 gnxrKEBcW2WMEYfNQ1lS+4oqaKMsHL5Ybllg/2mOzfPfF0ZfzCsccvbLsUwR0s/++6o0 EYnu2W5MqCpEc+b1BDQGjT6hb1ulGIHca6C8Pyk4yRqIbrF3nZTvXibTK6Z6q6oY9ulo xOjHw18gozEzvq092046KRHcrfWe/D+thDHMHfZKL2Tpwe+Es6wMYCUz76FD/r7+39Xp 8K1A== X-Gm-Message-State: APjAAAX7y2fBgphCuik1uPTtu4A8DUJ6u6u92H++gSh1FCkVD1wc/BUq ZHuWXUkap58bLPrMT/f1eZhXqgOFEp+Ofy4ZyThIxWdI9gNM+tHgekzSS91AudcjvYmK5SK0Fq1 EgyFXmOTNjMponcUgGrYrWjVPg8U6LEElEUR8iioWGg== X-Received: by 2002:a17:902:8489:: with SMTP id c9mr32058911plo.327.1563239415348; Mon, 15 Jul 2019 18:10:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwGLyajRnbcsSMqxJg/G0p/NUts4B0DivYTIy7ftzeQlB9JsUv3ZXKWzQdAnBTP6jU0p4qg6Q== X-Received: by 2002:a17:902:8489:: with SMTP id c9mr32058896plo.327.1563239415146; Mon, 15 Jul 2019 18:10:15 -0700 (PDT) Received: from localhost.localdomain (125-238-115-161-fibre.sparkbb.co.nz. [125.238.115.161]) by smtp.gmail.com with ESMTPSA id r1sm17236665pgv.70.2019.07.15.18.10.13 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 18:10:14 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][Eoan][PATCH 1/2] UBUNTU: [Config] Set CONFIG_DRM_HISI_HIBMC to arm64 only Date: Tue, 16 Jul 2019 13:09:55 +1200 Message-Id: <20190716010956.27539-2-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716010956.27539-1-matthew.ruffell@canonical.com> References: <20190716010956.27539-1-matthew.ruffell@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- 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(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 77ffaebbaa14..252f69b6e7fe 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -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 diff --git a/debian.master/config/annotations b/debian.master/config/annotations index fb01717011ff..375421088780 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -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'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 18219db23ba2..4b6aa2f0bdfc 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -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 diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index b77d2dca25c8..ccc8f7f862d6 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -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 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 0f399b7b878f..a57426ab7965 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -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 diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 86630df82141..ec43647ff4d8 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -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 diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index b97ddb2b0424..f7d232601aca 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -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 diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index e0a305497adc..883def6e79f2 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -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