From owner-svn-src-all@FreeBSD.ORG  Sat Dec 14 00:40:47 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E1756BC5;
 Sat, 14 Dec 2013 00:40:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD9A91FF6;
 Sat, 14 Dec 2013 00:40:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE0el6m005241;
 Sat, 14 Dec 2013 00:40:47 GMT
 (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE0elv3005240;
 Sat, 14 Dec 2013 00:40:47 GMT
 (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201312140040.rBE0elv3005240@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Sat, 14 Dec 2013 00:40:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r259370 - releng/10.0/sys/dev/drm2/radeon
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Dec 2013 00:40:48 -0000

Author: dumbbell
Date: Sat Dec 14 00:40:47 2013
New Revision: 259370
URL: http://svnweb.freebsd.org/changeset/base/259370

Log:
  MFC r259236:
  
  drm/radeon: radeon_dp_i2c_aux_ch() must return 0 on FreeBSD
  
  The code was unmodified compared to Linux and returned the amount of
  received bytes from the i2c bus. This led to non-working i2c bus and
  failure to eg. read monitor's EDID, if connected to DisplayPort.
  
  Tested by:	Mikaël Urankar <mikael.urankar@gmail.com>
  Approved by:	re (gjb)

Modified:
  releng/10.0/sys/dev/drm2/radeon/atombios_dp.c
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/sys/dev/drm2/radeon/atombios_dp.c
==============================================================================
--- releng/10.0/sys/dev/drm2/radeon/atombios_dp.c	Sat Dec 14 00:36:29 2013	(r259369)
+++ releng/10.0/sys/dev/drm2/radeon/atombios_dp.c	Sat Dec 14 00:40:47 2013	(r259370)
@@ -272,7 +272,7 @@ int radeon_dp_i2c_aux_ch(device_t dev, i
 		case AUX_I2C_REPLY_ACK:
 			if (mode == MODE_I2C_READ)
 				*read_byte = reply[0];
-			return ret;
+			return (0); /* Return ret on Linux. */
 		case AUX_I2C_REPLY_NACK:
 			DRM_DEBUG_KMS("aux_i2c nack\n");
 			return -EREMOTEIO;