From patchwork Mon Feb 24 13:17:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffman X-Patchwork-Id: 3709231 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 626D6BF40C for ; Mon, 24 Feb 2014 13:18:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A79B52015E for ; Mon, 24 Feb 2014 13:18:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C91662015D for ; Mon, 24 Feb 2014 13:18:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752619AbaBXNRn (ORCPT ); Mon, 24 Feb 2014 08:17:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62335 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752163AbaBXNRl (ORCPT ); Mon, 24 Feb 2014 08:17:41 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1ODHUHg013749 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 24 Feb 2014 08:17:30 -0500 Received: from nilsson.home.kraxel.org (vpn1-7-97.ams2.redhat.com [10.36.7.97]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1ODHTie026930; Mon, 24 Feb 2014 08:17:29 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 99BDD8056D; Mon, 24 Feb 2014 14:17:28 +0100 (CET) From: Gerd Hoffmann To: linux-fbdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, kys@microsoft.com, abgupta@microsoft.com, haiyangz@microsoft.com, jasowang@redhat.com, tomi.valkeinen@ti.com, devel@linuxdriverproject.org, Gerd Hoffmann , Jean-Christophe Plagniol-Villard Subject: [PATCH v3 4/4] hyperv-fb: kick off efifb early Date: Mon, 24 Feb 2014 14:17:11 +0100 Message-Id: <1393247831-5271-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1393247831-5271-1-git-send-email-kraxel@redhat.com> References: <1393247831-5271-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove firmware framebuffer before initializing hyperv-fb. Needed on gen2 virtual machines. Letting register_framebuffer handle the switchover results in efifb still being active while hyperv graphics are initialized, which in turn can make the linux kernel hang. Signed-off-by: Gerd Hoffmann --- drivers/video/hyperv_fb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c index 135d8cd..a570836 100644 --- a/drivers/video/hyperv_fb.c +++ b/drivers/video/hyperv_fb.c @@ -683,6 +683,7 @@ static int hvfb_getmem(struct fb_info *info) info->apertures->ranges[0].base = pci_resource_start(pdev, 0); info->apertures->ranges[0].size = pci_resource_len(pdev, 0); } + remove_conflicting_framebuffers(info->apertures, "hyperv-fb", false); info->fix.smem_start = par->mem.start; info->fix.smem_len = screen_fb_size;