Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752788AbaGGKpz (ORCPT ); Mon, 7 Jul 2014 06:45:55 -0400 Received: from mail001.aei.ca ([206.123.6.130]:49362 "EHLO mail001.aei.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752442AbaGGKpw (ORCPT ); Mon, 7 Jul 2014 06:45:52 -0400 From: Ed Tomlinson To: Chris Wilson , Intel Graphics Development , DRI Development , LKML , David Herrmann , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org, Jani Nikula , Dave Airlie Subject: Re: [Intel-gfx] [PATCH 5/5] drm/i915: Kick out vga console Date: Mon, 07 Jul 2014 06:45:49 -0400 Message-ID: <1974170.pJAPFfvtjC@grover> Organization: me User-Agent: KMail/4.13.2 (Linux/3.16.0-1-git; KDE/4.13.2; x86_64; ; ) In-Reply-To: <20140707084826.GH5821@phenom.ffwll.local> References: <1401980308-5116-1-git-send-email-daniel.vetter@ffwll.ch> <20140630065955.GD7687@nuc-i3427.alporthouse.com> <20140707084826.GH5821@phenom.ffwll.local> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Daniel, I am not quite sure I understand what you want me to test? Do you want me to try it without: > > + if (ret == 0) { > > + ret = do_unregister_con_driver(&vga_con); Thanks Ed On Monday 07 July 2014 10:48:26 Daniel Vetter wrote: > On Mon, Jun 30, 2014 at 07:59:55AM +0100, Chris Wilson wrote: > > On Sat, Jun 28, 2014 at 11:55:19PM -0400, Ed Tomlinson wrote: > > > On Saturday 28 June 2014 15:28:22 Ed Tomlinson wrote: > > > > > > Resend without html krud which causes list to bounce the message. > > > > > > > Hi > > > > > > > > This commit ( a4de05268e674e8ed31df6348269e22d6c6a1803 ) hangs my boot with 3.16-git. Reverting it lets the boot proceed. > > > > > > > > I have an i7 with a built-in i915 and an pcie r7 260x. The R7 is the primary console. The i915 is initialized > > > > but does not have a physical display attached. > > > > > > > > With the patch applied the boot stops at the messages: > > > > > > > > [drm] Memory usable by graphics device = 2048M > > > > [drm] Replacing VGA console driver > > > > The issue looks like that we are ripping out the radeon fb_con whilst it > > is active and that upsets everyone. In which case, I think the > > compromise is: > > > > > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > > index 5f44581..4915f1d 100644 > > --- a/drivers/gpu/drm/i915/i915_dma.c > > +++ b/drivers/gpu/drm/i915/i915_dma.c > > @@ -1439,18 +1439,20 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) > > #else > > static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) > > { > > - int ret; > > + int ret = 0; > > > > DRM_INFO("Replacing VGA console driver\n"); > > > > console_lock(); > > - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); > > - if (ret == 0) { > > - ret = do_unregister_con_driver(&vga_con); > > - > > - /* Ignore "already unregistered". */ > > - if (ret == -ENODEV) > > - ret = 0; > > + if (con_is_bound(&vga_con)) { > > + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); > > + if (ret == 0) { > > + ret = do_unregister_con_driver(&vga_con); > > Hm, we should only conditionalize the take_over_console - unregistering > vga_con is kinda the point to make sure it's gone for real. Ed, can you > please retest with the if (con_is_bound) check just for the > do_take_over_console call? > > Still puzzled wtf is going on here since as David says this should be a > no-op. > > Thanks, Daniel > > + > > + /* Ignore "already unregistered". */ > > + if (ret == -ENODEV) > > + ret = 0; > > + } > > } > > console_unlock(); > > > > -Chris > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/