From patchwork Fri Jul 1 12:29:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1651170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Cai3Okw5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4LZDzp4nnJz9s0w for ; Fri, 1 Jul 2022 22:29:58 +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 1o7FmQ-0002AM-Gh; Fri, 01 Jul 2022 12:29:50 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o7FmO-0002A5-4W for kernel-team@lists.ubuntu.com; Fri, 01 Jul 2022 12:29:48 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 510663FD83 for ; Fri, 1 Jul 2022 12:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656678585; bh=aBhbDhV2WmCsQEfBZfjulcSZBiuDunInwNU6/obOnVs=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Cai3Okw5Dcv2EcGZBo1FNska6XS25lHAGjJfVSyjkn2A4bopo9WCsnyJp39YkpAAa /rT2+5+ZzYXDTWpsELEDZ84G9jO8cxP2yUBbQQdioJWIzMM9Dt/Z8BPl2sFhtvbUZy v+aLetJfHV3OG2LnRqML2XkQ1VIL/2exIXwEh7tKQRegLsmf5WEZ6Orwp1mq5oXNb1 UdzPdegEqt98/YjVR/hWYXsmQ8cLVQsVDqg252OnthHAFIZF5s0ow5EQ9fsNwFZm+1 w0O1yU9TY+BWCmanclQrcF5GSYQTeyob9cg8fi7JiNF5JH4uT+U1wKJ2yeQq1gVO4m p5/NIb/DLaSsg== Received: by mail-ej1-f71.google.com with SMTP id qa41-20020a17090786a900b00722f313a60eso715427ejc.13 for ; Fri, 01 Jul 2022 05:29:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=aBhbDhV2WmCsQEfBZfjulcSZBiuDunInwNU6/obOnVs=; b=YbbMdp9Hio6ztfK0ch5xkI1I7vT9czAGjma9UW5JoWMZgZI+UL0D5qpouCnKdu+iFw tqawj9z7dOY0q77udnaN3X4Irbu6+lSTLMUtPhMOrkrH/WIlQfJk7dh8RIUUKUkmbFcV +GhPAx1s4F1YIjSVaMFFFjojh8mmBHPRS10e1bN75Y5WQ+OGsz9m1RqVcqChs3K3kyfO atbbUEyBWBySPzsfSdMiI7EG/fmPIX9JVNsiXt8OIHzTciq6m47XhD+r8Vf0TMCpzBKi cVUstLzYjsDFLBAXS/neU+wbPo/wkKZv1rW91hnjWAOlHHvRT+aWlwdiF/wIMUxRU1qt nZ6w== X-Gm-Message-State: AJIora9QCzO20U+5aa9s/DF4sv7DaonkQLwFz7Nps4E7gYkUa/+17w1g SgXhmR2i02bA6EIdV8XoKqu2wiizyju4/jtFLKcj6UALZN1NjdiWQZxs0nyBeZma8l+fVqcIyB+ TJgseDw/6DA08A7U41SB2SrMNQQVRTlV9s6mN3HCqFg== X-Received: by 2002:a05:6402:c47:b0:437:ce2d:c30d with SMTP id cs7-20020a0564020c4700b00437ce2dc30dmr18719336edb.395.1656678585038; Fri, 01 Jul 2022 05:29:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tOInvlQuvMLD1uk79La9/7DXCbIHuSHLEEVPfZ+qRteKArf4xzFtEMftwG6kXROMHBfwdc2w== X-Received: by 2002:a05:6402:c47:b0:437:ce2d:c30d with SMTP id cs7-20020a0564020c4700b00437ce2dc30dmr18719320edb.395.1656678584859; Fri, 01 Jul 2022 05:29:44 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id u17-20020a056402111100b0042deea0e961sm15068495edv.67.2022.07.01.05.29.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 05:29:44 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][J/raspi][PATCH] UBUNTU: [Config] raspi: Disable DRM_SIMPLEDRM and set FB_SIMPLE=y Date: Fri, 1 Jul 2022 14:29:41 +0200 Message-Id: <20220701122941.1273922-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 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/1976147 Some older (?) monitors/cables don't show the kernel boot messages when 'quiet' and 'splash' are removed from the commandline until the kernel switches to the vc4drmfb frame buffer device. Building the simplefb module into the kernel (like raspberrypi does) fixes that. Signed-off-by: Juerg Haefliger Acked-by: Tim Gardner Acked-by: Stefan Bader --- debian.raspi/abi/arm64/raspi.modules | 1 - debian.raspi/abi/armhf/raspi-nolpae.modules | 1 - debian.raspi/abi/armhf/raspi.modules | 1 - debian.raspi/config/annotations | 2 ++ debian.raspi/config/config.common.ubuntu | 4 ++-- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian.raspi/abi/arm64/raspi.modules b/debian.raspi/abi/arm64/raspi.modules index 7f046787ac65..c8fb8b23ea62 100644 --- a/debian.raspi/abi/arm64/raspi.modules +++ b/debian.raspi/abi/arm64/raspi.modules @@ -4032,7 +4032,6 @@ sil164 silead simple-bridge simple-mfd-i2c -simpledrm simplefb siox-core sir_ir diff --git a/debian.raspi/abi/armhf/raspi-nolpae.modules b/debian.raspi/abi/armhf/raspi-nolpae.modules index b24e741390cb..ec5f4cd0202f 100644 --- a/debian.raspi/abi/armhf/raspi-nolpae.modules +++ b/debian.raspi/abi/armhf/raspi-nolpae.modules @@ -4043,7 +4043,6 @@ sil164 silead simple-bridge simple-mfd-i2c -simpledrm simplefb siox-core sir_ir diff --git a/debian.raspi/abi/armhf/raspi.modules b/debian.raspi/abi/armhf/raspi.modules index 2ccdaa498618..fbf6bbed0728 100644 --- a/debian.raspi/abi/armhf/raspi.modules +++ b/debian.raspi/abi/armhf/raspi.modules @@ -4044,7 +4044,6 @@ sil164 silead simple-bridge simple-mfd-i2c -simpledrm simplefb siox-core sir_ir diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations index c23b50617591..77ebacd80105 100644 --- a/debian.raspi/config/annotations +++ b/debian.raspi/config/annotations @@ -4,6 +4,8 @@ include "../../debian.master/config/annotations" +CONFIG_FB_SIMPLE policy<{'*': 'y'}> mark note + CONFIG_VIRTIO_PCI policy<{'*': 'm'}> mark note CONFIG_MFD_RASPBERRYPI_POE_HAT policy<{'*': 'm'}> mark note diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu index 577c11d2bceb..8631028e0e18 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -2131,7 +2131,7 @@ CONFIG_DRM_SCHED=m CONFIG_DRM_SII902X=m CONFIG_DRM_SII9234=m CONFIG_DRM_SIL_SII8620=m -CONFIG_DRM_SIMPLEDRM=m +# CONFIG_DRM_SIMPLEDRM is not set CONFIG_DRM_SIMPLE_BRIDGE=m # CONFIG_DRM_STI is not set # CONFIG_DRM_STM is not set @@ -2561,7 +2561,7 @@ CONFIG_FB_S3_DDC=y CONFIG_FB_SAVAGE=m # CONFIG_FB_SAVAGE_ACCEL is not set CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SIMPLE=m +CONFIG_FB_SIMPLE=y CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y