frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set Int10Current->Tag for the linux native int10 module 

Fixes bug #9296
(cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit)
This commit is contained in:
Alan Hourihane 2006-12-13 12:13:11 +00:00
parent 81281cb298
commit b88ad820fa
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/int10/generic.c
View File

@ -98,7 +98,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS); base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS);
pvp = xf86GetPciInfoForEntity(entityIndex); pvp = xf86GetPciInfoForEntity(entityIndex);
if (pvp) pInt->Tag = ((pciConfigPtr)(pvp->thisCard))->tag; if (pvp) pInt->Tag = pciTag(pvp->bus, pvp->device, pvp->func);
/* /*
* we need to map video RAM MMIO as some chipsets map mmio * we need to map video RAM MMIO as some chipsets map mmio

3
hw/xfree86/os-support/linux/int10/linux.c
View File

@ -90,6 +90,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
legacyVGARec vga; legacyVGARec vga;
xf86int10BiosLocation bios; xf86int10BiosLocation bios;
Bool videoBiosMapped = FALSE; Bool videoBiosMapped = FALSE;
pciVideoPtr pvp;
if (int10Generation != serverGeneration) { if (int10Generation != serverGeneration) {
counter = 0; counter = 0;
@ -151,6 +152,8 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec)); pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec));
pInt->scrnIndex = screen; pInt->scrnIndex = screen;
pInt->entityIndex = entityIndex; pInt->entityIndex = entityIndex;
pvp = xf86GetPciInfoForEntity(entityIndex);
if (pvp) pInt->Tag = pciTag(pvp->bus, pvp->device, pvp->func);
if (!xf86Int10ExecSetup(pInt)) if (!xf86Int10ExecSetup(pInt))
goto error0; goto error0;
pInt->mem = &linuxMem; pInt->mem = &linuxMem;