Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752680AbaGHCxV (ORCPT ); Mon, 7 Jul 2014 22:53:21 -0400 Received: from mail001.aei.ca ([206.123.6.130]:34464 "EHLO mail001.aei.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751566AbaGHCxT (ORCPT ); Mon, 7 Jul 2014 22:53:19 -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 22:53:16 -0400 Message-ID: <2319392.n3fnJUhemF@grover> Organization: me User-Agent: KMail/4.13.2 (Linux/3.16.0-1-git; KDE/4.13.2; x86_64; ; ) In-Reply-To: <20140707122654.GQ5821@phenom.ffwll.local> References: <1401980308-5116-1-git-send-email-daniel.vetter@ffwll.ch> <1974170.pJAPFfvtjC@grover> <20140707122654.GQ5821@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 Hi Daniel, The patch below also works. You can use my Tested By for it. Thanks Ed Tomlinson PS. I _really_ need to get a serial console working on my i7 box. On Monday 07 July 2014 14:26:54 Daniel Vetter wrote: > On Mon, Jul 07, 2014 at 06:45:49AM -0400, Ed Tomlinson wrote: > > 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); > > Below the diff of what I mean. > -Daniel > > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 5e583a1838f8..bd8517151479 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1466,12 +1466,13 @@ 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 (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); > > -- 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/