From owner-freebsd-ports@FreeBSD.ORG  Tue Feb  8 22:39:07 2011
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@FreeBSD.org
Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by hub.freebsd.org (Postfix) with ESMTP id 4FCBF1065670;
	Tue,  8 Feb 2011 22:39:07 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
From: Jung-uk Kim <jkim@FreeBSD.org>
To: freebsd-ports@FreeBSD.org,
 miwi@freebsd.org
Date: Tue, 8 Feb 2011 17:38:55 -0500
User-Agent: KMail/1.6.2
References: <AANLkTi=mLUhSJyTD2-su3obG=3S0ni=zGOZM-Sen_V5M@mail.gmail.com>
In-Reply-To: <AANLkTi=mLUhSJyTD2-su3obG=3S0ni=zGOZM-Sen_V5M@mail.gmail.com>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_DYcUNrrd8mIBAcC"
Message-Id: <201102081738.59493.jkim@FreeBSD.org>
Cc: freebsd-x11@freebsd.org
Subject: Re: [CFT] xf86-video-ati 6.14.0
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Feb 2011 22:39:07 -0000


--Boundary-00=_DYcUNrrd8mIBAcC
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline

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

--Boundary-00=_DYcUNrrd8mIBAcC
Content-Type: text/plain; charset="utf-8"; name="patch-src-atombios_output.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="patch-src-atombios_output.c"

--- 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);

--Boundary-00=_DYcUNrrd8mIBAcC--