From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 5/5] drm/i915: Kick out vga console Date: Mon, 7 Jul 2014 14:26:54 +0200 Message-ID: <20140707122654.GQ5821@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> <1974170.pJAPFfvtjC@grover> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 39EBF89FC9 for ; Mon, 7 Jul 2014 05:26:45 -0700 (PDT) Received: by mail-we0-f173.google.com with SMTP id t60so4324453wes.4 for ; Mon, 07 Jul 2014 05:26:44 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1974170.pJAPFfvtjC@grover> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ed Tomlinson Cc: linux-fbdev@vger.kernel.org, Intel Graphics Development , LKML , DRI Development , Tomi Valkeinen , Jean-Christophe Plagniol-Villard List-Id: dri-devel@lists.freedesktop.org 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); -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch