xserver: fix build on arm tinderbox
Rob Clark got an ARM tinderbox up and running, and this code is built there but not here, this should fix it, though I hope that code never gets executed. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
6d86b64dba
commit
db9d2b8a50
|
@ -179,7 +179,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
|
||||||
vbiosMem = (char *) base + V_BIOS;
|
vbiosMem = (char *) base + V_BIOS;
|
||||||
memset(vbiosMem, 0, 2 * V_BIOS_SIZE);
|
memset(vbiosMem, 0, 2 * V_BIOS_SIZE);
|
||||||
if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
|
if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
|
||||||
xf86DrvMsg(screen, X_WARNING,
|
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
|
||||||
"Unable to retrieve all of segment 0x0C0000.\n");
|
"Unable to retrieve all of segment 0x0C0000.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -194,10 +194,10 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
|
||||||
vbiosMem = (unsigned char *) base + bios_location;
|
vbiosMem = (unsigned char *) base + bios_location;
|
||||||
|
|
||||||
if (xf86IsEntityPrimary(entityIndex)) {
|
if (xf86IsEntityPrimary(entityIndex)) {
|
||||||
if (int10_check_bios(screen, bios_location >> 4, vbiosMem))
|
if (int10_check_bios(pScrn->scrnIndex, bios_location >> 4, vbiosMem))
|
||||||
done = TRUE;
|
done = TRUE;
|
||||||
else
|
else
|
||||||
xf86DrvMsg(screen, X_INFO,
|
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||||
"No legacy BIOS found -- trying PCI\n");
|
"No legacy BIOS found -- trying PCI\n");
|
||||||
}
|
}
|
||||||
if (!done) {
|
if (!done) {
|
||||||
|
@ -207,7 +207,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
|
||||||
|
|
||||||
err = pci_device_read_rom(rom_device, vbiosMem);
|
err = pci_device_read_rom(rom_device, vbiosMem);
|
||||||
if (err) {
|
if (err) {
|
||||||
xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (5) %s\n",
|
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot read V_BIOS (5) %s\n",
|
||||||
strerror(err));
|
strerror(err));
|
||||||
goto error1;
|
goto error1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user