diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2003-04-26 08:29:41 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2003-04-26 08:29:41 +0000 |
| commit | ccc32eb8fb8f8a4ec557f8ac36cdd9d06fe61110 (patch) | |
| tree | 8c0659643c7e02934a73a556dd244204e6d00dff /x11-servers/XFree86-4-Server | |
| parent | e5aa7d1091c41e3a1c50ace191b8eec1fb24c5bc (diff) | |
| download | ports-ccc32eb8fb8f8a4ec557f8ac36cdd9d06fe61110.tar.gz ports-ccc32eb8fb8f8a4ec557f8ac36cdd9d06fe61110.zip | |
Fix a typo which caused problems on Radeon R300 cards, including text mode
restoring not working.
Obtained from: RedHat
Notes
Notes:
svn path=/head/; revision=79668
Diffstat (limited to 'x11-servers/XFree86-4-Server')
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 4 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/files/patch-radeon_reg.h | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index c9f3f4534d62..119afd954171 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -7,7 +7,7 @@ PORTNAME= Server PORTVERSION= 4.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -34,7 +34,7 @@ PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files .for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \ patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \ patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \ - patch-radeon_cursor.c + patch-radeon_cursor.c patch-radeon_reg.h EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor SCRIPTS_ENV= OSVERSION=${OSVERSION} \ diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h b/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h new file mode 100644 index 000000000000..7131c938ac1c --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h.orig Fri Feb 7 10:08:59 2003 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h Sat Apr 26 01:10:10 2003 +@@ -879,7 +879,7 @@ + # define RADEON_P2PLL_REF_DIV_MASK 0x03ff + # define RADEON_P2PLL_ATOMIC_UPDATE_R (1 << 15) /* same as _W */ + # define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */ +-# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff < 18) ++# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff << 18) + # define R300_PPLL_REF_DIV_ACC_SHIFT 18 + #define RADEON_PALETTE_DATA 0x00b4 + #define RADEON_PALETTE_30_DATA 0x00b8 |