From patchwork Tue Jul 16 01:08:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1132385 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 45nj2r0Hn3z9sMr; Tue, 16 Jul 2019 11:08:50 +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 1hnBxV-0005AH-RA; Tue, 16 Jul 2019 01:08:45 +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 1hnBxT-00059s-IC for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:08:43 +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 1hnBxT-000654-3N for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:08:43 +0000 Received: by mail-pf1-f198.google.com with SMTP id 6so11299307pfz.10 for ; Mon, 15 Jul 2019 18:08:43 -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=2gil1cGk95q5BVC4cJ64rLzQtASitCacaWkbyiD63bc=; b=TbvzsjQg8P0aXEFI6+2X3hZ8qz5etYPtHzTQyD6dZkNgsaYA63QAcf4r0FFGMXqZRB /kzJrgvlktnQvuydOok8fCaaEDRDQX8xKF5LYvMbkVuMeeiwnlXy++Wp9XANvhDi/KCK lh/JCs5wYZCwu22UYYWYdJlkC1KKgxuA73EnvPcbAXlfdYNV2n/g+JMi45HhsiIq2TPE EeHuZI7JYSSmabidlqNIWwJezmJvv+Sub7N/MUmokk/WaQi+YRGbhGbpQvfPDazEyaA/ xX+752MJaInGb6TUk0lkO1/wrsJ5TCiVKdDj0ApGp17GbwjuWSBMl5uOpEc4VT9sKL7T M2Uw== X-Gm-Message-State: APjAAAXDDkjPgkoId/XKEI0hSAZmEFDkvmg9muauEJhegKjLqTXtHy3j ss+uoavt2aGvI+sAC0f/me1S1jlzsHkwduT0Kj0DTlK0dmOmNmzdzPSVyviMgMLS6+4ewOce4MH 7RDGwEn5sy7L4IcCvfh3Yd1LfuR0d22rRGy6Pfdu09w== X-Received: by 2002:a17:902:b905:: with SMTP id bf5mr29592681plb.342.1563239321700; Mon, 15 Jul 2019 18:08:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzHgW3ZG/WfVKRlooufWhYD/bbFIs+n2EFir8DDZddaBdIk30ClXRX1vwJYldDNgBEM6R7QQ== X-Received: by 2002:a17:902:b905:: with SMTP id bf5mr29592671plb.342.1563239321573; Mon, 15 Jul 2019 18:08:41 -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 s24sm19478254pfh.133.2019.07.15.18.08.40 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 18:08:41 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/2] UBUNTU: [Config] Set CONFIG_DRM_HISI_HIBMC to arm64 only Date: Tue, 16 Jul 2019 13:08:27 +1200 Message-Id: <20190716010828.27415-2-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716010828.27415-1-matthew.ruffell@canonical.com> References: <20190716010828.27415-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/annotations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index ce6eb7e43b92..512a652f95eb 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<{'armhf-generic': 'm'}> CONFIG_DRM_ETNAVIV_REGISTER_LOGGING policy<{'armhf-generic': 'n'}> 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'}> +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'}> From patchwork Tue Jul 16 01:08:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1132383 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 45nj2r0bFrz9sNH; Tue, 16 Jul 2019 11:08:51 +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 1hnBxX-0005B6-Vy; Tue, 16 Jul 2019 01:08:47 +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 1hnBxV-0005AB-Ml for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:08:45 +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 1hnBxV-00065A-6t for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 01:08:45 +0000 Received: by mail-pg1-f197.google.com with SMTP id p29so3322598pgm.10 for ; Mon, 15 Jul 2019 18:08:45 -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=HCiPDZKx86cdSNs+N1g/qyLi3UbNro+ykZPAk+a2FycI0rQd2f8l60FHaTHHG/2ObE ww6JIOQzjGEzTtytY8ZGm1Dl1zB3RZ1C7RjgmuLe4OkIvHTf+mGgCljSXaEX5RRqaKnS 0eT0vBRCBhdxyXm1l96T8cer7eH8X6Tza1jkTNEIgfwggg/T+x778QoLP+V6p2Y4LgQw tGjelENn3BspxoaQzGRzBY3ebUKmMmtfGbZr/6cnaqev5pwywEZAm1btBhfRaZDSdigq jOI95MY1sVrpmNuk53lgnrCvuHzOrJ0LWBenP6FMj0os+qrawI5a/syW6Wc+kPYV4aFJ y4/w== X-Gm-Message-State: APjAAAVG9fePTsCY1Z5rzSLRp3fEj/PpwV1yi5MwKwQga9vr93qVtrSx BJaMcANgV/89C0IjSXjMXgW7HjIwpQbeya21+9M4ghzBQUjtoxrP8CMeeJAs/srhIy0TmKlOvqF uj+dxNsWOBOYw4YB2W+T/W0tmntzN5mhGNR6Hh6ZdyA== X-Received: by 2002:a63:7a01:: with SMTP id v1mr30835065pgc.310.1563239323732; Mon, 15 Jul 2019 18:08:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+ySfhsw1YeKSJ2Vm0gn/iZYg6mrs11ZhJcpEGfQEhwwM6qhaYa9yF2c2saLpLIJq5B+XI1Q== X-Received: by 2002:a63:7a01:: with SMTP id v1mr30835050pgc.310.1563239323550; Mon, 15 Jul 2019 18:08:43 -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 s24sm19478254pfh.133.2019.07.15.18.08.41 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 18:08:43 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 2/2] UBUNTU: SAUCE: Make CONFIG_DRM_HISI_HIBMC depend on ARM64 Date: Tue, 16 Jul 2019 13:08:28 +1200 Message-Id: <20190716010828.27415-3-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716010828.27415-1-matthew.ruffell@canonical.com> References: <20190716010828.27415-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