From patchwork Tue Jul 16 01:09:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1132387 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 45nj3r6p9Zz9sNF; Tue, 16 Jul 2019 11:09:44 +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 1hnByP-0005Hh-KK; Tue, 16 Jul 2019 01:09:41 +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 1hnByN-0005Gv-Ol for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:09:39 +0000 Received: from mail-pg1-f199.google.com ([209.85.215.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hnByN-00067p-6y for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:09:39 +0000 Received: by mail-pg1-f199.google.com with SMTP id q9so11517629pgv.17 for ; Mon, 15 Jul 2019 18:09:39 -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=rco2itPQr+haZWaQwYmP1yebAuebFu/6qWK/BbZ1q+k=; b=PpsyH3B8+wC1rjoOR3CFMcRpE4YFr/SkmrnU6SYVL9Y9U95fx7MgAtYjbwX1S2kGoc qu/tO0/mBv+fWpThg9c911YPpd3wYv90qDnU3uaiEtjv2eDTD84dalnoNr0qV+YtvhKF cOv2JATowmMh3Fib6HJXNSvvLLDPfoEXklNSikdMU/9hXkCA19EQupBOUuQuEyr+Ah/z O0IIDpf5tSnHsp01Aonbqzuy35twEOTxAvpsiHAuTD1MsDW5ofiAPeC0LM4LC2oK4r4m 15yT+e6SLj4hrgqpFOzOpkEUNz6lcj+9SxO1P4HggvC+zlnBTueBKrNMiaeTJFrPNAWB t5Bg== X-Gm-Message-State: APjAAAUVW0/kRERbrDcRzEQUV0Hp2zlBoOxUH+2bM/I+HGIklZaepss5 7QTWfS/HZRLhrVAkmJu9Py+bzIiiioBDHhSYyHvnFhLW6E7JI451Wm3M4MNA4Lo0VrPNlEzLFUE xw1z1ja52O1/Xmduk4q2CZNtk7JFEwybJ0BWpbRBkQQ== X-Received: by 2002:a17:902:7612:: with SMTP id k18mr31379085pll.48.1563239377787; Mon, 15 Jul 2019 18:09:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYwwapuuEP0Z39Dce7q12wRwytwYtNJ5GeOQxzV6RoShKh5k/UtiGK3y5E3x85PpOVndusTg== X-Received: by 2002:a17:902:7612:: with SMTP id k18mr31379072pll.48.1563239377586; Mon, 15 Jul 2019 18:09:37 -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 e5sm22489283pfd.56.2019.07.15.18.09.36 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 18:09:37 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][Disco][PATCH 1/2] UBUNTU: [Config] Set CONFIG_DRM_HISI_HIBMC to arm64 only Date: Tue, 16 Jul 2019 13:09:23 +1200 Message-Id: <20190716010924.27481-2-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716010924.27481-1-matthew.ruffell@canonical.com> References: <20190716010924.27481-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 016b97e2bbe0..6516904e646d 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -78,7 +78,6 @@ CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DP_CEC=y -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 2394b9f08107..8122916784cd 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1757,7 +1757,7 @@ CONFIG_DRM_VC4_HDMI_CEC policy<{'arm64': 'y'}> CONFIG_DRM_ETNAVIV policy<{'arm64': 'm', 'armhf-generic': 'm'}> CONFIG_DRM_ETNAVIV_THERMAL policy<{'arm64': 'y', 'armhf-generic': '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 c54f90c7e704..21e1278e9093 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -89,7 +89,6 @@ CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DP_CEC=y -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 3dde9db509f2..522c05593011 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -79,7 +79,6 @@ CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DP_CEC=y -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 df275aa4a69d..098fe3647a30 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2412,6 +2412,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 fd537cbf0b03..2a22c58e7187 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -75,7 +75,6 @@ CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DP_CEC=y -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 d5e65b1a36aa..7311ae85c9cf 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -74,7 +74,6 @@ CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DP_CEC=y -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 cde17322e831..175f5929c106 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -65,7 +65,6 @@ CONFIG_DM_DEBUG=y # CONFIG_DRM_CIRRUS_QEMU is not set # CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DP_CEC 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 From patchwork Tue Jul 16 01:09:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1132388 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 45nj3t6Clkz9sLt; Tue, 16 Jul 2019 11:09:46 +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 1hnByR-0005Ie-Q8; Tue, 16 Jul 2019 01:09:43 +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 1hnByP-0005HZ-FY for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:09:41 +0000 Received: from mail-pf1-f198.google.com ([209.85.210.198]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hnByP-00067z-1C for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:09:41 +0000 Received: by mail-pf1-f198.google.com with SMTP id 191so11284181pfy.20 for ; Mon, 15 Jul 2019 18:09:40 -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=3HfPbWFIAT5DjS/LACbqKtE9E5jG30mASj43YQqz4/U=; b=C84DNmf/5N2c98c2bEt7g8oHs6CmzudRpKGZ9EfTNG4tDdW6Tn207zM5NZcixVdufC 2OK3tXq7p3TnR3gLqKzVJc3V564UgTyYX6wzJy94qcN3ydkapZRfN5VSNDYwzX2Va5LW GZnmj7jkH5Hi79fPABzo5Z/2GoAcvFkpoz1lovZKP5lSOWm7rTIUqcZSN/HiO3/USiqP SqjmXChrt3uiDB9pMVWxfUhKX4aUnLJXKMDdgrz1u9cp0nAvXyEyH8SydmDbHwlXPvWW Z6fVCn65uJLtTOZBomZjqFycGu1aXe7lLy5yEHrNUNFwP1VsCPo7a57TEDjmI4GirkX9 b0LA== X-Gm-Message-State: APjAAAWheCScNvh4pfa6u3sbl8mxK99bcfY0lKpcJZ3BIR8C3fQa/Ve5 9lHQyRofUe+Y3FEbUod1MapsmxNPjdKWZNtNxNCNXkwt6cNMPpI57xQhPh1eEiH/ZfvDuFtPP2x 8wNjpx38MPTer45TMMI5ksEeXGlw0zQcE2oerSR4nGw== X-Received: by 2002:a17:902:28c9:: with SMTP id f67mr32151939plb.19.1563239379613; Mon, 15 Jul 2019 18:09:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKdFXQW528fXQBZEkIgk0nyJgsCqaEdord+EfAvN/aznbWuJtuReoJ0Tj2SUTBeHeAuO648w== X-Received: by 2002:a17:902:28c9:: with SMTP id f67mr32151929plb.19.1563239379472; Mon, 15 Jul 2019 18:09:39 -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 e5sm22489283pfd.56.2019.07.15.18.09.37 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 18:09:39 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][Disco][PATCH 2/2] UBUNTU: SAUCE: Make CONFIG_DRM_HISI_HIBMC depend on ARM64 Date: Tue, 16 Jul 2019 13:09:24 +1200 Message-Id: <20190716010924.27481-3-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716010924.27481-1-matthew.ruffell@canonical.com> References: <20190716010924.27481-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 developed hibmc_drm for their arm64 based soc and did not intend for this driver to be used on any other architecture than arm64. Using it on amd64 leads to the screen being unreadable, forcing users to manually blacklist the module on the kernel command line to use the d-i server installer. Make CONFIG_DRM_HISI_HIBMC firmly depend on arm64 to ensure it is not built for other architectures. Signed-off-by: Matthew Ruffell --- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/Kconfig b/drivers/gpu/drm/hisilicon/hibmc/Kconfig index c7129dc3bdfc..cb6455065004 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig +++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig @@ -1,6 +1,6 @@ config DRM_HISI_HIBMC tristate "DRM Support for Hisilicon Hibmc" - depends on DRM && PCI && MMU + depends on DRM && PCI && MMU && ARM64 select DRM_KMS_HELPER select DRM_TTM