From owner-svn-src-all@FreeBSD.ORG Sun Mar 1 12:47:37 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E29A2C08; Sun, 1 Mar 2015 12:47:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3070AB1; Sun, 1 Mar 2015 12:47:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t21ClbQo035969; Sun, 1 Mar 2015 12:47:37 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t21Clb2p035966; Sun, 1 Mar 2015 12:47:37 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201503011247.t21Clb2p035966@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Sun, 1 Mar 2015 12:47:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r279487 - head/sys/dev/pci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2015 12:47:38 -0000 Author: dumbbell Date: Sun Mar 1 12:47:36 2015 New Revision: 279487 URL: https://svnweb.freebsd.org/changeset/base/279487 Log: vgapci: New vga_pci_repost() function This can be used to restore the VGA mode after a KMS driver is unloaded. Differential Revision: https://reviews.freebsd.org/D687 Modified: head/sys/dev/pci/pcivar.h head/sys/dev/pci/vga_pci.c Modified: head/sys/dev/pci/pcivar.h ============================================================================== --- head/sys/dev/pci/pcivar.h Sun Mar 1 10:39:19 2015 (r279486) +++ head/sys/dev/pci/pcivar.h Sun Mar 1 12:47:36 2015 (r279487) @@ -591,5 +591,6 @@ struct pcicfg_vpd *pci_fetch_vpd_list(de int vga_pci_is_boot_display(device_t dev); void * vga_pci_map_bios(device_t dev, size_t *size); void vga_pci_unmap_bios(device_t dev, void *bios); +int vga_pci_repost(device_t dev); #endif /* _PCIVAR_H_ */ Modified: head/sys/dev/pci/vga_pci.c ============================================================================== --- head/sys/dev/pci/vga_pci.c Sun Mar 1 10:39:19 2015 (r279486) +++ head/sys/dev/pci/vga_pci.c Sun Mar 1 12:47:36 2015 (r279487) @@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include /* To re-POST the card. */ + struct vga_resource { struct resource *vr_res; int vr_refs; @@ -194,6 +196,36 @@ vga_pci_unmap_bios(device_t dev, void *b vr->vr_res); } +int +vga_pci_repost(device_t dev) +{ +#if defined(__amd64__) || defined(__i386__) + x86regs_t regs; + + if (!vga_pci_is_boot_display(dev)) + return (EINVAL); + + if (x86bios_get_orm(VGA_PCI_BIOS_SHADOW_ADDR) == NULL) + return (ENOTSUP); + + x86bios_init_regs(®s); + + regs.R_AH = pci_get_bus(dev); + regs.R_AL = (pci_get_slot(dev) << 3) | (pci_get_function(dev) & 0x07); + regs.R_DL = 0x80; + + device_printf(dev, "REPOSTing\n"); + x86bios_call(®s, X86BIOS_PHYSTOSEG(VGA_PCI_BIOS_SHADOW_ADDR + 3), + X86BIOS_PHYSTOOFF(VGA_PCI_BIOS_SHADOW_ADDR + 3)); + + x86bios_get_intr(0x10); + + return (0); +#else + return (ENOTSUP); +#endif +} + static int vga_pci_probe(device_t dev) {