ports/154885: [PATCH] x11-drivers/xf86-video-ati: update to 6.14.0

[Martin Wilke]

>Number:         154885
>Category:       ports
>Synopsis:       [PATCH] x11-drivers/xf86-video-ati: update to 6.14.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 19 13:10:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Martin Wilke
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD miwibox.dyndns.org 9.0-CURRENT FreeBSD 9.0-CURRENT #4 r218594: Sat Feb 12 14:55:30 MYT
>Description:
- Update to 6.14.0

Added file(s):
- files/patch-src-atombios_output.c
- files/patch-src-radeon_driver.c
- files/patch-src-radeon_output.c

Port maintainer (x11 at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- xf86-video-ati-6.14.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-drivers/xf86-video-ati/Makefile,v
retrieving revision 1.23
diff -u -u -r1.23 Makefile
--- Makefile	27 Dec 2010 19:55:37 -0000	1.23
+++ Makefile	6 Feb 2011 06:03:24 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.13.2
+PORTVERSION=	6.14.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -14,14 +14,9 @@
 
 USE_GL=		gl
 
+USE_DOS2UNIX=	yes
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 MAN4=		ati.4x radeon.4x
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC=	4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/x11-drivers/xf86-video-ati/distinfo,v
retrieving revision 1.17
diff -u -u -r1.17 distinfo
--- distinfo	27 Dec 2010 19:55:37 -0000	1.17
+++ distinfo	5 Feb 2011 05:36:50 -0000
@@ -1,3 +1,2 @@
-MD5 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = a8f92fe3c458e511f4e2ead7f92c02b0
-SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
-SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
+SHA256 (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
+SIZE (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 1054336
Index: files/patch-src-atombios_output.c
===================================================================
RCS file: files/patch-src-atombios_output.c
diff -N files/patch-src-atombios_output.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-atombios_output.c	9 Feb 2011 01:35:17 -0000
@@ -0,0 +1,35 @@
+--- src/atombios_output.c.orig	2011-02-08 17:18:04.000000000 -0500
++++ src/atombios_output.c	2011-02-08 17:18:54.000000000 -0500
+@@ -172,7 +172,6 @@
+ #define DP_SET_POWER_D3  0x2
+ 
+ static void do_displayport_link_train(xf86OutputPtr output);
+-static void atombios_pick_dig_encoder(xf86OutputPtr output);
+ 
+ static int
+ atombios_output_dac_setup(xf86OutputPtr output, int action)
+@@ -1469,7 +1468,6 @@
+ 
+     if (radeon_encoder == NULL)
+         return;
+-    atombios_pick_dig_encoder(output);
+ 
+     switch (radeon_encoder->encoder_id) {
+     case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
+@@ -1781,7 +1779,7 @@
+     }
+ }
+ 
+-static void
++void
+ atombios_pick_dig_encoder(xf86OutputPtr output)
+ {
+     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(output->scrn);
+@@ -1878,7 +1876,6 @@
+ 	return;
+ 
+     radeon_output->pixel_clock = adjusted_mode->Clock;
+-    atombios_pick_dig_encoder(output);
+     atombios_output_overscan_setup(output, mode, adjusted_mode);
+     atombios_output_scaler_setup(output);
+     atombios_set_output_crtc_source(output);
Index: files/patch-src-radeon_driver.c
===================================================================
RCS file: files/patch-src-radeon_driver.c
diff -N files/patch-src-radeon_driver.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-radeon_driver.c	3 Dec 2010 10:38:38 -0000
@@ -0,0 +1,12 @@
+--- src/radeon_driver.c.orig	2010-12-03 20:34:44.419175412 +1000
++++ src/radeon_driver.c	2010-12-03 20:37:22.896179333 +1000
+@@ -1454,6 +1454,9 @@
+      * internal memory map.
+      * See fdo bug 24301.
+      */
++    if (mem_size > aper_size)
++	mem_size = aper_size;
++
+     if (mem_size > 0x20000000)
+ 	mem_size = aper_size;
+ 
Index: files/patch-src-radeon_output.c
===================================================================
RCS file: files/patch-src-radeon_output.c
diff -N files/patch-src-radeon_output.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-radeon_output.c	6 Feb 2011 10:14:33 -0000
@@ -0,0 +1,20 @@
+--- src/radeon_output.c.orgi	2011-02-06 18:12:31.000000000 +0800
++++ src/radeon_output.c	2011-02-06 18:13:52.000000000 +0800
+@@ -120,6 +120,8 @@
+ radeon_bios_output_crtc(xf86OutputPtr output);
+ static void
+ radeon_bios_output_lock(xf86OutputPtr output, Bool lock);
++extern void
++atombios_pick_dig_encoder(xf86OutputPtr output);
+ 
+ void RADEONPrintPortMap(ScrnInfoPtr pScrn)
+ {
+@@ -731,6 +733,8 @@
+     }
+ 
+     radeon_bios_output_lock(output, TRUE);
++    if (IS_AVIVO_VARIANT)
++	atombios_pick_dig_encoder(output);
+     radeon_dpms(output, DPMSModeOff);
+     radeon_crtc_dpms(output->crtc, DPMSModeOff);
+ 
--- xf86-video-ati-6.14.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: