[CFT] xf86-video-ati 6.14.0

[Jung-uk Kim]

On Saturday 05 February 2011 12:22 am, Martin Wilke wrote:
> Howdy,
>
> 2 days ago was a new ati driver released. fluffy@ and me was using
> for few weeks the git version without problems, but we’d like to
> make sure this dosen’t broke anything for our ati users.
> Here is a patch:
> http://people.freebsd.org/~miwi/ati-6140.diff<http://people.freebsd
>.org/%7Emiwi/ati-6140.diff> Changelog:
> http://lists.freedesktop.org/archives/xorg-announce/2011-February/0
>01602.html
>
> Please test and report back, if no problems I’d like to commit it
> next week. thx
> PS: this release fix some problems with HD54XX chips the bug with
> strg+ctrl+backspace; bug is gone for me.

Unfortunately, it didn't work for me, i.e., 
atombios_pick_dig_encoder() undefined.  It seems the 
src/atombios_output.c patch was mis-merged.  Please see the attached 
patch for the fix.

Thanks for working on this!

Jung-uk Kim
-------------- next part --------------
--- 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);