diff options
author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2004-06-22 14:28:46 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2004-06-22 14:28:46 +0000 |
commit | 5ed7e6f8424236dd57d83f6ab1282693260969cb (patch) | |
tree | d34b866b0e45776b9eeeafb7663ba85c78853037 /src/i830_dga.c | |
parent | a46e95722d3c2b9dfb9eacf9a390a7c47d427773 (diff) |
i915 support
Dual Head support for i830, i855, i915.
ARGB cursor support (including i810) for all chipsets.
Diffstat (limited to 'src/i830_dga.c')
-rw-r--r-- | src/i830_dga.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/i830_dga.c b/src/i830_dga.c index bb4c103a..b1416598 100644 --- a/src/i830_dga.c +++ b/src/i830_dga.c @@ -34,7 +34,7 @@ * with <TAB> characters expanded at 8-column intervals. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dga.c,v 1.3 2003/02/26 04:11:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dga.c,v 1.2 2002/11/05 02:01:18 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -281,7 +281,12 @@ I830_OpenFramebuffer(ScrnInfoPtr pScrn, *name = NULL; /* no special device */ *mem = (unsigned char *)(pI830->LinearAddr + pScrn->fbOffset); - *size = pI830->FrontBuffer.Size; + if (pI830->init == 0) + *size = pI830->FrontBuffer.Size; + else { + I830Ptr pI8301 = I830PTR(pI830->entityPrivate->pScrn_1); + *size = pI8301->FrontBuffer2.Size; + } *offset = 0; *flags = DGA_NEED_ROOT; |