svn commit: r279487 - head/sys/dev/pci

[Bjoern A. Zeeb]

> On 01 Mar 2015, at 12:47 , Jean-Sebastien Pedron <dumbbell at FreeBSD.org> wrote:
> 
> 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


I think this broke a couple of i386 and pc98 kernel configs:

pc98 GENERIC-NODEBUG kernel failed, check _.pc98.GENERIC-NODEBUG for details
pc98 GENERIC kernel failed, check _.pc98.GENERIC for details
pc98 LINT kernel failed, check _.pc98.LINT for details
i386 XBOX kernel failed, check _.i386.XBOX for details
i386 XEN kernel failed, check _.i386.XEN for details

linking kernel.debug
vga_pci.o: In function `vga_pci_repost':
/scratch/tmp/bz/head.svn/sys/dev/pci/vga_pci.c:(.text+0x591): undefined reference to `x86bios_get_orm'
/scratch/tmp/bz/head.svn/sys/dev/pci/vga_pci.c:(.text+0x5ac): undefined reference to `x86bios_init_regs'
/scratch/tmp/bz/head.svn/sys/dev/pci/vga_pci.c:(.text+0x701): undefined reference to `x86bios_call'
/scratch/tmp/bz/head.svn/sys/dev/pci/vga_pci.c:(.text+0x70d): undefined reference to `x86bios_get_intr'
--- kernel.debug ---


> 
> 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 <dev/pci/pcireg.h>
> #include <dev/pci/pcivar.h>
> 
> +#include <compat/x86bios/x86bios.h> /* 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(&regs);
> +
> +	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(&regs, 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)
> {
> 

— 
Bjoern A. Zeeb                                  Charles Haddon Spurgeon:
"Friendship is one of the sweetest joys of life.  Many might have failed
 beneath the bitterness of their trial  had they not found a friend."