From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91F44C31E45 for ; Thu, 13 Jun 2019 16:04:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C4BB20679 for ; Thu, 13 Jun 2019 16:04:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560441888; bh=N8qfoztD7dRorllnB+Hau1xtrZJQ97QIH7SlFYFD3ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2st5770hsCKmZ4LerwkoNHktnRtMd+tVTNRD7q/r8N0efcIbVqs5ox6njbDS5Simr arJPD973QsJrgyngG5TXHxsdnZrclzWh1RX6/OI5sOW6rHkIBHXBtZLvVgiODOiYHL M5U1FOIQRhwn1ps7RVqkL+stGn/pj8+FEkclITak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391205AbfFMQEr (ORCPT ); Thu, 13 Jun 2019 12:04:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:35194 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731350AbfFMIqr (ORCPT ); Thu, 13 Jun 2019 04:46:47 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4823720851; Thu, 13 Jun 2019 08:46:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415606; bh=N8qfoztD7dRorllnB+Hau1xtrZJQ97QIH7SlFYFD3ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bUMvCvpbilBl7vr+DWkmeRg0FYils+lFfxqgRafRQle0yRqlaI33zp4188WSo97xP VrXy9epDP6A47GH9009AqspbTcTGHRbPz1gYs3ivq6AoaAXdWWoOScdYBL1gF4K/Gx ln0cwAB3CxbN2in4HhkIwrQOrSbsCNB19PXd/9rY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Schwab , Prarit Bhargava , Yisheng Xie , Kees Cook , Daniel Vetter , Steven Rostedt , Marko Myllynen , Hans de Goede , Thierry Reding , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [PATCH 5.1 061/155] fbcon: Dont reset logo_shown when logo is currently shown Date: Thu, 13 Jun 2019 10:32:53 +0200 Message-Id: <20190613075656.477705080@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075652.691765927@linuxfoundation.org> References: <20190613075652.691765927@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 3c5a1b111373e669c8220803464c3a508a87e254 ] When the logo is currently drawn on a virtual console, and the console loglevel is reduced to quiet, logo_shown must be left alone, so that it the scrolling region on that virtual console is properly reset. Fixes: 10993504d647 ("fbcon: Silence fbcon logo on 'quiet' boots") Signed-off-by: Andreas Schwab Cc: Prarit Bhargava Cc: Yisheng Xie Cc: Kees Cook Cc: Daniel Vetter Cc: Steven Rostedt Cc: Marko Myllynen Cc: Hans de Goede Cc: Thierry Reding Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index c59b23f6e9ba..a9c69ae30878 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1069,7 +1069,7 @@ static void fbcon_init(struct vc_data *vc, int init) cap = info->flags; - if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) + if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET) logo_shown = FBCON_LOGO_DONTSHOW; if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || -- 2.20.1