From owner-svn-src-stable@FreeBSD.ORG  Wed Dec 11 23:15:19 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 DE4CA3E7;
 Wed, 11 Dec 2013 23:15:19 +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 C9E2812CA;
 Wed, 11 Dec 2013 23:15:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBBNFJCh099268;
 Wed, 11 Dec 2013 23:15:19 GMT
 (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBBNFJ23099267;
 Wed, 11 Dec 2013 23:15:19 GMT
 (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201312112315.rBBNFJ23099267@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Wed, 11 Dec 2013 23:15:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259237 - stable/10/sys/dev/drm2
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Dec 2013 23:15:20 -0000

Author: dumbbell
Date: Wed Dec 11 23:15:19 2013
New Revision: 259237
URL: http://svnweb.freebsd.org/changeset/base/259237

Log:
  MFC r258930:
  
  drm: Read PCIER_LINK_CAP/PCIER_LINK_CAP2 from the PCI bridge
  
  Before this fix, capabilities were read from vgapci and were incorrect.

Modified:
  stable/10/sys/dev/drm2/drm_pci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/drm2/drm_pci.c
==============================================================================
--- stable/10/sys/dev/drm2/drm_pci.c	Wed Dec 11 23:06:03 2013	(r259236)
+++ stable/10/sys/dev/drm2/drm_pci.c	Wed Dec 11 23:15:19 2013	(r259237)
@@ -134,7 +134,11 @@ int drm_pcie_get_speed_cap_mask(struct d
 	if (!drm_device_is_pcie(dev))
 		return -EINVAL;
 
-	root = device_get_parent(dev->device);
+	root =
+	    device_get_parent( /* pcib             */
+	    device_get_parent( /* `-- pci          */
+	    device_get_parent( /*     `-- vgapci   */
+	    dev->device)));    /*         `-- drmn */
 
 	pos = 0;
 	pci_find_cap(root, PCIY_EXPRESS, &pos);