1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Fix a typo which caused problems on Radeon R300 cards, including text mode

restoring not working.

Obtained from:	RedHat
This commit is contained in:
Eric Anholt 2003-04-26 08:29:41 +00:00
parent e5aa7d1091
commit ccc32eb8fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=79668
4 changed files with 26 additions and 4 deletions

View File

@ -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} \

View File

@ -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

View File

@ -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} \

View File

@ -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