From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Wed, 12 Sep 2018 09:12:35 +0000 Subject: [PATCH] efifb: BGRT: Add nobgrt option Message-Id: <20180912091235.20473-1-hdegoede@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Bartlomiej Zolnierkiewicz Cc: Hans de Goede , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org In some setups restoring the BGRT logo is undesirable, allow passing video=EFifb:nobgrt on the kernel commandline to disable it. Cc: David Herrmann Reported-by: David Herrmann Signed-off-by: Hans de Goede --- drivers/video/fbdev/efifb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 3946649b85c8..ba906876cc45 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -42,6 +42,7 @@ struct bmp_dib_header { u32 colors_important; } __packed; =20 +static bool use_bgrt =3D true; static bool request_mem_succeeded =3D false; static u64 mem_flags =3D EFI_MEMORY_WC | EFI_MEMORY_UC; =20 @@ -160,6 +161,9 @@ static void efifb_show_boot_graphics(struct fb_info *in= fo) void *bgrt_image =3D NULL; u8 *dst =3D info->screen_base; =20 + if (!use_bgrt) + return; + if (!bgrt_tab.image_address) { pr_info("efifb: No BGRT, not showing boot graphics\n"); return; @@ -290,6 +294,8 @@ static int efifb_setup(char *options) screen_info.lfb_width =3D simple_strtoul(this_opt+6, NULL, 0); else if (!strcmp(this_opt, "nowc")) mem_flags &=3D ~EFI_MEMORY_WC; + else if (!strcmp(this_opt, "nobgrt")) + use_bgrt =3D false; } } =20 --=20 2.19.0.rc0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [PATCH] efifb: BGRT: Add nobgrt option Date: Wed, 12 Sep 2018 11:12:35 +0200 Message-ID: <20180912091235.20473-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6277F6E4CC for ; Wed, 12 Sep 2018 09:12:39 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Bartlomiej Zolnierkiewicz Cc: Hans de Goede , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SW4gc29tZSBzZXR1cHMgcmVzdG9yaW5nIHRoZSBCR1JUIGxvZ28gaXMgdW5kZXNpcmFibGUsIGFs bG93IHBhc3NpbmcKdmlkZW89ZWZpZmI6bm9iZ3J0IG9uIHRoZSBrZXJuZWwgY29tbWFuZGxpbmUg dG8gZGlzYWJsZSBpdC4KCkNjOiBEYXZpZCBIZXJybWFubiA8ZGguaGVycm1hbm5AZ21haWwuY29t PgpSZXBvcnRlZC1ieTogRGF2aWQgSGVycm1hbm4gPGRoLmhlcnJtYW5uQGdtYWlsLmNvbT4KU2ln bmVkLW9mZi1ieTogSGFucyBkZSBHb2VkZSA8aGRlZ29lZGVAcmVkaGF0LmNvbT4KLS0tCiBkcml2 ZXJzL3ZpZGVvL2ZiZGV2L2VmaWZiLmMgfCA2ICsrKysrKwogMSBmaWxlIGNoYW5nZWQsIDYgaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvZWZpZmIuYyBiL2Ry aXZlcnMvdmlkZW8vZmJkZXYvZWZpZmIuYwppbmRleCAzOTQ2NjQ5Yjg1YzguLmJhOTA2ODc2Y2M0 NSAxMDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9mYmRldi9lZmlmYi5jCisrKyBiL2RyaXZlcnMv dmlkZW8vZmJkZXYvZWZpZmIuYwpAQCAtNDIsNiArNDIsNyBAQCBzdHJ1Y3QgYm1wX2RpYl9oZWFk ZXIgewogCXUzMiBjb2xvcnNfaW1wb3J0YW50OwogfSBfX3BhY2tlZDsKIAorc3RhdGljIGJvb2wg dXNlX2JncnQgPSB0cnVlOwogc3RhdGljIGJvb2wgcmVxdWVzdF9tZW1fc3VjY2VlZGVkID0gZmFs c2U7CiBzdGF0aWMgdTY0IG1lbV9mbGFncyA9IEVGSV9NRU1PUllfV0MgfCBFRklfTUVNT1JZX1VD OwogCkBAIC0xNjAsNiArMTYxLDkgQEAgc3RhdGljIHZvaWQgZWZpZmJfc2hvd19ib290X2dyYXBo aWNzKHN0cnVjdCBmYl9pbmZvICppbmZvKQogCXZvaWQgKmJncnRfaW1hZ2UgPSBOVUxMOwogCXU4 ICpkc3QgPSBpbmZvLT5zY3JlZW5fYmFzZTsKIAorCWlmICghdXNlX2JncnQpCisJCXJldHVybjsK KwogCWlmICghYmdydF90YWIuaW1hZ2VfYWRkcmVzcykgewogCQlwcl9pbmZvKCJlZmlmYjogTm8g QkdSVCwgbm90IHNob3dpbmcgYm9vdCBncmFwaGljc1xuIik7CiAJCXJldHVybjsKQEAgLTI5MCw2 ICsyOTQsOCBAQCBzdGF0aWMgaW50IGVmaWZiX3NldHVwKGNoYXIgKm9wdGlvbnMpCiAJCQkJc2Ny ZWVuX2luZm8ubGZiX3dpZHRoID0gc2ltcGxlX3N0cnRvdWwodGhpc19vcHQrNiwgTlVMTCwgMCk7 CiAJCQllbHNlIGlmICghc3RyY21wKHRoaXNfb3B0LCAibm93YyIpKQogCQkJCW1lbV9mbGFncyAm PSB+RUZJX01FTU9SWV9XQzsKKwkJCWVsc2UgaWYgKCFzdHJjbXAodGhpc19vcHQsICJub2JncnQi KSkKKwkJCQl1c2VfYmdydCA9IGZhbHNlOwogCQl9CiAJfQogCi0tIAoyLjE5LjAucmMwCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK