4 files changed, 3 insertions, 59 deletions

diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index b97e6e2e33cc..b73774247f8b 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.14.0
-PORTREVISION=	1
+PORTVERSION=	6.14.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index 1180e6585774..6c0c57497ba2 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
-SIZE (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 1054336
+SHA256 (xorg/driver/xf86-video-ati-6.14.1.tar.bz2) = e457285096e1e40f53ae5b58b948906c69add5160cc38ce510f0d15e82d91c75
+SIZE (xorg/driver/xf86-video-ati-6.14.1.tar.bz2) = 1058696
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c b/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c
deleted file mode 100644
index bb4d826be806..000000000000
--- a/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/atombios_output.c.orig	2011-01-27 10:05:58.000000000 -0700
-+++ src/atombios_output.c	2011-02-05 12:20:30.000000000 -0700
-@@ -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);
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c b/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c
deleted file mode 100644
index 18a0713a04bd..000000000000
--- a/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/radeon_output.c.orig	2011-02-01 17:01:22.000000000 -0700
-+++ src/radeon_output.c	2011-02-05 12:22:53.000000000 -0700
-@@ -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);
-