From owner-svn-src-head@FreeBSD.ORG  Fri Oct 19 19:17:44 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A425BC54;
 Fri, 19 Oct 2012 19:17:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 89C1A8FC0C;
 Fri, 19 Oct 2012 19:17:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9JJHiUt059370;
 Fri, 19 Oct 2012 19:17:44 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9JJHi5l059368;
 Fri, 19 Oct 2012 19:17:44 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201210191917.q9JJHi5l059368@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 19 Oct 2012 19:17:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241748 - head/sys/dev/acpica
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: Fri, 19 Oct 2012 19:17:44 -0000

Author: jhb
Date: Fri Oct 19 19:17:43 2012
New Revision: 241748
URL: http://svn.freebsd.org/changeset/base/241748

Log:
  When checking to see if a video output's _ADR matches an entry in the
  parent adapter's _DOD list, only check the low 16 bits of both _ADR and
  _DOD.  The language in the ACPI spec seems to indicate that the _ADR values
  should exactly match the entries in _DOD.  However, I assume that the
  masking added to _DOD values was added to work around some known busted
  machines (the commit history doesn't indicate either way), and the ACPI
  spec does require that the low 16 bits are unique for all video outputs,
  so only check the low 16 bits should be fine.
  
  This fixes recognition of video outputs that use the new standardized
  device ID scheme in ACPI 3.0 that set bit 31 such as certain Dell laptops.
  
  Tested by:	Juergen Lock  nox  jelal kn-bremen de
  MFC after:	3 days

Modified:
  head/sys/dev/acpica/acpi_video.c

Modified: head/sys/dev/acpica/acpi_video.c
==============================================================================
--- head/sys/dev/acpica/acpi_video.c	Fri Oct 19 18:50:19 2012	(r241747)
+++ head/sys/dev/acpica/acpi_video.c	Fri Oct 19 19:17:43 2012	(r241748)
@@ -906,7 +906,8 @@ vid_enum_outputs_subr(ACPI_HANDLE handle
 
 	for (i = 0; i < argset->dod_pkg->Package.Count; i++) {
 		if (acpi_PkgInt32(argset->dod_pkg, i, &val) == 0 &&
-		    (val & DOD_DEVID_MASK_FULL) == adr) {
+		    (val & DOD_DEVID_MASK_FULL) ==
+		    (adr & DOD_DEVID_MASK_FULL)) {
 			argset->callback(handle, val, argset->context);
 			argset->count++;
 		}