xf86-video-intel: Branch 'modesetting' - src/i830_bios.c

[Eric Anholt]

 src/i830_bios.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree fb10966e9f43f44488097b0daf2fbe10c6a804dc (from a66f2c01f7d557d860883346671fb864807dbdca)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Thu May 4 18:52:08 2006 -0700

    Use xf86int10Addr() when calculating an address to read the video BIOS from, out
    
    of int10's copy.  Fixes a crash on FreeBSD.

diff --git a/src/i830_bios.c b/src/i830_bios.c
index 19b1b5a..4b87351 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -91,7 +91,8 @@ i830GetBIOS(ScrnInfoPtr pScrn)
 	return FALSE;
 
     if (pI830->pVbe != NULL) {
-	memcpy(pI830->VBIOS, (void *)(pI830->pVbe->pInt10->BIOSseg << 4),
+	memcpy(pI830->VBIOS, xf86int10Addr(pI830->pVbe->pInt10,
+					   pI830->pVbe->pInt10->BIOSseg << 4),
 	       INTEL_VBIOS_SIZE);
     } else {
 	xf86ReadPciBIOS(0, pI830->PciTag, 0, pI830->VBIOS, INTEL_VBIOS_SIZE);