diff options
Diffstat (limited to 'src/sis_cursor.c')
| -rw-r--r-- | src/sis_cursor.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/sis_cursor.c b/src/sis_cursor.c index 7abf4e3..0ebb44d 100644 --- a/src/sis_cursor.c +++ b/src/sis_cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_cursor.c,v 1.27 2004/01/23 22:29:04 twini Exp $ */ +/* $XFree86$ */ /* * SiS hardware cursor handling * @@ -12,10 +12,7 @@ * 2) Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3) All advertising materials mentioning features or use of this software - * must display the following acknowledgement: "This product includes - * software developed by Thomas Winischhofer, Vienna, Austria." - * 4) The name of the author may not be used to endorse or promote products + * 3) The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR @@ -921,18 +918,13 @@ SiS300UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) } #endif break; - case PCI_CHIP_SIS330: -#ifdef SISDUALHEAD - if((!pSiS->DualHeadMode) || (!pSiS->SecondHead)) -#endif - if(pSiS->MiscFlags & MISC_TVNTSC1024) return FALSE; - /* fall through */ case PCI_CHIP_SIS550: case PCI_CHIP_SIS650: case PCI_CHIP_SIS315: case PCI_CHIP_SIS315H: case PCI_CHIP_SIS315PRO: case PCI_CHIP_SIS660: + case PCI_CHIP_SIS330: if(mode->Flags & V_INTERLACE) return FALSE; if((mode->Flags & V_DBLSCAN) && (pCurs->bits->height > 32)) @@ -993,17 +985,12 @@ SiSUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs) } #endif break; - case PCI_CHIP_SIS330: -#ifdef SISDUALHEAD - if((!pSiS->DualHeadMode) || (!pSiS->SecondHead)) -#endif - if(pSiS->MiscFlags & MISC_TVNTSC1024) return FALSE; - /* fall through */ case PCI_CHIP_SIS550: case PCI_CHIP_SIS650: case PCI_CHIP_SIS315: case PCI_CHIP_SIS315H: case PCI_CHIP_SIS315PRO: + case PCI_CHIP_SIS330: case PCI_CHIP_SIS660: if(mode->Flags & V_INTERLACE) return FALSE; |