From owner-svn-src-head@FreeBSD.ORG  Mon Apr  8 08:37:58 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 68E01CE9;
 Mon,  8 Apr 2013 08:37:58 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5C4C7AB3;
 Mon,  8 Apr 2013 08:37:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r388bwnk097301;
 Mon, 8 Apr 2013 08:37:58 GMT (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r388bwYW097300;
 Mon, 8 Apr 2013 08:37:58 GMT (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201304080837.r388bwYW097300@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Mon, 8 Apr 2013 08:37:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249249 - head/sys/dev/drm2
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Apr 2013 08:37:58 -0000

Author: dumbbell
Date: Mon Apr  8 08:37:57 2013
New Revision: 249249
URL: http://svnweb.freebsd.org/changeset/base/249249

Log:
  drm: Right-shift I2C slave address before passing it to aux channel
  
  In r249041, I2C slave addresses were left-shifted at creation time to
  have the same behavior between i915 and radeon (not committed yet). This
  change broke the aux channel. The user-visible change was that display
  port on i915 didn't work anymore.
  
  To fix this, we right-shift the address back to restore the original value.
  
  Reported by:	Olivier Cochard-Labbé <olivier@cochard.me>
  Tested by:	Olivier Cochard-Labbé <olivier@cochard.me>
  Reviewed by:	kib@

Modified:
  head/sys/dev/drm2/drm_dp_iic_helper.c

Modified: head/sys/dev/drm2/drm_dp_iic_helper.c
==============================================================================
--- head/sys/dev/drm2/drm_dp_iic_helper.c	Mon Apr  8 08:35:24 2013	(r249248)
+++ head/sys/dev/drm2/drm_dp_iic_helper.c	Mon Apr  8 08:37:57 2013	(r249249)
@@ -146,7 +146,7 @@ iic_dp_aux_xfer(device_t idev, struct ii
 		len = msgs[m].len;
 		buf = msgs[m].buf;
 		reading = (msgs[m].flags & IIC_M_RD) != 0;
-		ret = iic_dp_aux_address(idev, msgs[m].slave, reading);
+		ret = iic_dp_aux_address(idev, msgs[m].slave >> 1, reading);
 		if (ret != 0)
 			break;
 		if (reading) {