1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

sync with x11/XFree86-4

- support ATI XPERT 128.
This commit is contained in:
FUJISHIMA Satsuki 2002-01-05 20:47:49 +00:00
parent 9b569a32a1
commit 6a7dedd842
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=52634
4 changed files with 66 additions and 2 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.1.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0

View File

@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.1.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0

View File

@ -0,0 +1,56 @@
--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.orig Fri May 11 09:56:10 2001
+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h Wed Dec 26 19:23:28 2001
@@ -234,6 +234,7 @@
#define PCI_CHIP_RAGE128ML 0x4D4C
#define PCI_CHIP_RAGE128PD 0x5044
#define PCI_CHIP_RAGE128PF 0x5046
+#define PCI_CHIP_RAGE128PE 0x5050
#define PCI_CHIP_RAGE128PR 0x5052
#define PCI_CHIP_RADEON_QD 0x5144
#define PCI_CHIP_RADEON_QE 0x5145
@@ -826,6 +827,7 @@
{PCI_CHIP_RAGE128MF, "Rage 128 Mobility MF",0},
{PCI_CHIP_RAGE128ML, "Rage 128 Mobility ML",0},
{PCI_CHIP_RAGE128PD, "Rage 128 Pro PD",0},
+ {PCI_CHIP_RAGE128PE, "Rage 128 Xpert 128",0},
{PCI_CHIP_RAGE128PF, "Rage 128 Pro PF",0},
{PCI_CHIP_RAGE128PR, "Rage 128 Pro PR",0},
{PCI_CHIP_RADEON_QD, "Radeon QD",0},
--- programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c.orig Fri May 4 21:05:33 2001
+++ programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c Wed Dec 26 19:24:14 2001
@@ -81,6 +81,7 @@
{ PCI_CHIP_RAGE128RK, "ATI Rage 128 RK (PCI)" },
{ PCI_CHIP_RAGE128RL, "ATI Rage 128 RL (AGP)" },
{ PCI_CHIP_RAGE128PD, "ATI Rage 128 Pro PD (PCI)" },
+ { PCI_CHIP_RAGE128PE, "ATI Rage 128 Xpert 128 (PCI)" },
{ PCI_CHIP_RAGE128PF, "ATI Rage 128 Pro PF (AGP)" },
{ PCI_CHIP_RAGE128LE, "ATI Rage 128 Mobility LE (PCI)" },
{ PCI_CHIP_RAGE128LF, "ATI Rage 128 Mobility LF (AGP)" },
@@ -96,6 +97,7 @@
{ PCI_CHIP_RAGE128RK, PCI_CHIP_RAGE128RK, RES_SHARED_VGA },
{ PCI_CHIP_RAGE128RL, PCI_CHIP_RAGE128RL, RES_SHARED_VGA },
{ PCI_CHIP_RAGE128PD, PCI_CHIP_RAGE128PD, RES_SHARED_VGA },
+ { PCI_CHIP_RAGE128PE, PCI_CHIP_RAGE128PE, RES_SHARED_VGA },
{ PCI_CHIP_RAGE128PF, PCI_CHIP_RAGE128PF, RES_SHARED_VGA },
{ PCI_CHIP_RAGE128LE, PCI_CHIP_RAGE128LE, RES_SHARED_VGA },
{ PCI_CHIP_RAGE128LF, PCI_CHIP_RAGE128LF, RES_SHARED_VGA },
--- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Wed May 30 00:51:08 2001
+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Wed Dec 26 19:24:14 2001
@@ -895,6 +895,7 @@
case PCI_CHIP_RAGE128RK:
case PCI_CHIP_RAGE128RL:
case PCI_CHIP_RAGE128PD:
+ case PCI_CHIP_RAGE128PE:
case PCI_CHIP_RAGE128PF:
default: info->HasPanelRegs = FALSE; break;
}
@@ -1025,7 +1026,8 @@
case PCI_CHIP_RAGE128LE:
case PCI_CHIP_RAGE128RE:
case PCI_CHIP_RAGE128RK:
- case PCI_CHIP_RAGE128PD: info->IsPCI = TRUE; break;
+ case PCI_CHIP_RAGE128PD:
+ case PCI_CHIP_RAGE128PE: info->IsPCI = TRUE; break;
case PCI_CHIP_RAGE128LF:
case PCI_CHIP_RAGE128MF:
case PCI_CHIP_RAGE128ML:

View File

@ -1,5 +1,13 @@
--- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c.orig Sat Oct 6 05:29:25 2001
+++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c Fri Oct 5 17:28:40 2001
@@ -705,6 +705,7 @@
case PCI_CHIP_RAGE128LE:
case PCI_CHIP_RAGE128RE:
case PCI_CHIP_RAGE128RK:
+ case PCI_CHIP_RAGE128PE:
/* This is a PCI card, do nothing */
break;
@@ -985,12 +985,12 @@
/* Check the r128 DRM version */
version = drmGetVersion(info->drmFD);