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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D6F8C433F5 for ; Wed, 2 Mar 2022 19:38:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241774AbiCBTjg (ORCPT ); Wed, 2 Mar 2022 14:39:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233668AbiCBTjd (ORCPT ); Wed, 2 Mar 2022 14:39:33 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95248C485F; Wed, 2 Mar 2022 11:38:49 -0800 (PST) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 099132199B; Wed, 2 Mar 2022 19:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1646249928; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SqbJsc1TBGvxQcYVNa9lPWZfK+TLadggigkpbeRkDR8=; b=Cs8G4w0HowThm3kITe3nH4J1b3Dp2Zri0J/tFIt6wGn/jMJcxg2Z0Ar5XGIrgKDzvstgnl 3c7E+QhR2O4dP+y7txv4Jf4gzKhrF/ukQdhHLZEPkNbPozFy8cT9IwgyugJlT8o33cuBLx hzMlTYIGBITkxAg1VO9W8/2jNqporbA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1646249928; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SqbJsc1TBGvxQcYVNa9lPWZfK+TLadggigkpbeRkDR8=; b=okr0zA+HwG4MIR5vKGAb9kJUBDMgJPDjTd5F2qQEYxw96PsgzQ8ayWJNTt6Dld/jyPitGA Wxom2jaza1u584Bg== Received: from kunlun.suse.cz (unknown [10.100.128.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 5C202A3B84; Wed, 2 Mar 2022 19:38:47 +0000 (UTC) Date: Wed, 2 Mar 2022 20:38:46 +0100 From: Michal =?iso-8859-1?Q?Such=E1nek?= To: Thomas Zimmermann Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, David Airlie , Dave Hansen , "H. Peter Anvin" , Sam Ravnborg , Helge Deller , x86@kernel.org, Javier Martinez Canillas , Ingo Molnar , Arnd Bergmann , Borislav Petkov , Maxime Ripard , Thomas Gleixner , Andy Shevchenko , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Martin Mares , linux-video@atrey.karlin.mff.cuni.cz, Daniel Mack Subject: Re: [PATCH] simpldrm: Enable boot time VESA graphic mode selection. Message-ID: <20220302193846.GT3113@kunlun.suse.cz> References: <20220218093334.24830-1-msuchanek@suse.de> <354f3cfd-bfa0-3ebe-3d67-705423d9294e@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <354f3cfd-bfa0-3ebe-3d67-705423d9294e@suse.de> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On Wed, Mar 02, 2022 at 08:31:25PM +0100, Thomas Zimmermann wrote: > Hi, > > is this ready to be merged? The objections raised so far have been addressed in v4. I think this is good to merge. Thanks Michal > > Best regards > Thomas > > Am 18.02.22 um 10:33 schrieb Michal Suchanek: > > Since switch to simpledrm VESA graphic modes are no longer available > > with legacy BIOS. > > > > The x86 realmode boot code enables the VESA graphic modes when option > > FB_BOOT_VESA_SUPPORT is enabled. > > > > To enable use of VESA modes with simpledrm in legacy BIOS boot mode drop > > dependency of BOOT_VESA_SUPPORT on FB, also drop the FB_ prefix, and > > select the option when simpledrm is built-in on x86. > > > > Fixes: 11e8f5fd223b ("drm: Add simpledrm driver") > > Signed-off-by: Michal Suchanek > > --- > > arch/x86/boot/video-vesa.c | 4 ++-- > > drivers/gpu/drm/tiny/Kconfig | 1 + > > drivers/video/fbdev/Kconfig | 9 ++++----- > > 3 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c > > index 7e185977a984..c2c6d35e3a43 100644 > > --- a/arch/x86/boot/video-vesa.c > > +++ b/arch/x86/boot/video-vesa.c > > @@ -83,7 +83,7 @@ static int vesa_probe(void) > > (vminfo.memory_layout == 4 || > > vminfo.memory_layout == 6) && > > vminfo.memory_planes == 1) { > > -#ifdef CONFIG_FB_BOOT_VESA_SUPPORT > > +#ifdef CONFIG_BOOT_VESA_SUPPORT > > /* Graphics mode, color, linear frame buffer > > supported. Only register the mode if > > if framebuffer is configured, however, > > @@ -121,7 +121,7 @@ static int vesa_set_mode(struct mode_info *mode) > > if ((vminfo.mode_attr & 0x15) == 0x05) { > > /* It's a supported text mode */ > > is_graphic = 0; > > -#ifdef CONFIG_FB_BOOT_VESA_SUPPORT > > +#ifdef CONFIG_BOOT_VESA_SUPPORT > > } else if ((vminfo.mode_attr & 0x99) == 0x99) { > > /* It's a graphics mode with linear frame buffer */ > > is_graphic = 1; > > diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig > > index 712e0004e96e..1bc30c64ed15 100644 > > --- a/drivers/gpu/drm/tiny/Kconfig > > +++ b/drivers/gpu/drm/tiny/Kconfig > > @@ -54,6 +54,7 @@ config DRM_GM12U320 > > config DRM_SIMPLEDRM > > tristate "Simple framebuffer driver" > > depends on DRM && MMU > > + select BOOT_VESA_SUPPORT if X86 && DRM_SIMPLEDRM = y > > select DRM_GEM_SHMEM_HELPER > > select DRM_KMS_HELPER > > help > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > > index 6ed5e608dd04..4f3be9b7a520 100644 > > --- a/drivers/video/fbdev/Kconfig > > +++ b/drivers/video/fbdev/Kconfig > > @@ -66,9 +66,8 @@ config FB_DDC > > select I2C_ALGOBIT > > select I2C > > -config FB_BOOT_VESA_SUPPORT > > +config BOOT_VESA_SUPPORT > > bool > > - depends on FB > > help > > If true, at least one selected framebuffer driver can take advantage > > of VESA video modes set at an early boot stage via the vga= parameter. > > @@ -627,7 +626,7 @@ config FB_VESA > > select FB_CFB_FILLRECT > > select FB_CFB_COPYAREA > > select FB_CFB_IMAGEBLIT > > - select FB_BOOT_VESA_SUPPORT > > + select BOOT_VESA_SUPPORT > > help > > This is the frame buffer device driver for generic VESA 2.0 > > compliant graphic cards. The older VESA 1.2 cards are not supported. > > @@ -1051,7 +1050,7 @@ config FB_INTEL > > select FB_CFB_FILLRECT > > select FB_CFB_COPYAREA > > select FB_CFB_IMAGEBLIT > > - select FB_BOOT_VESA_SUPPORT if FB_INTEL = y > > + select BOOT_VESA_SUPPORT if FB_INTEL = y > > depends on !DRM_I915 > > help > > This driver supports the on-board graphics built in to the Intel > > @@ -1378,7 +1377,7 @@ config FB_SIS > > select FB_CFB_FILLRECT > > select FB_CFB_COPYAREA > > select FB_CFB_IMAGEBLIT > > - select FB_BOOT_VESA_SUPPORT if FB_SIS = y > > + select BOOT_VESA_SUPPORT if FB_SIS = y > > select FB_SIS_300 if !FB_SIS_315 > > help > > This is the frame buffer device driver for the SiS 300, 315, 330 > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Ivo Totev