From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Marshall <mark.marshall@csr.com>
Subject: Re: [PATCH] vgaarb: use bridges to control VGA routing where possible.
Date: Thu, 16 Dec 2010 12:03:07 +0000
Message-ID: <iecv5s$8co$1@dough.gmane.org>
References: <1292478877-19461-1-git-send-email-airlied__3528.0286254876$1292480593$gmane$org@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from lo.gmane.org (lo.gmane.org [80.91.229.12])
	by gabe.freedesktop.org (Postfix) with ESMTP id 5ED359E82F
	for <dri-devel@lists.freedesktop.org>;
	Thu, 16 Dec 2010 04:03:22 -0800 (PST)
Received: from list by lo.gmane.org with local (Exim 4.69)
	(envelope-from <sf-dri-devel@m.gmane.org>) id 1PTCYL-00056M-Cc
	for dri-devel@lists.freedesktop.org; Thu, 16 Dec 2010 13:03:21 +0100
Received: from 193.128.72.68 ([193.128.72.68])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <dri-devel@lists.freedesktop.org>; Thu, 16 Dec 2010 13:03:21 +0100
Received: from mark.marshall by 193.128.72.68 with local (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <dri-devel@lists.freedesktop.org>; Thu, 16 Dec 2010 13:03:21 +0100
In-Reply-To: <1292478877-19461-1-git-send-email-airlied__3528.0286254876$1292480593$gmane$org@gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
To: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

On 16/12/2010 05:54, Dave Airlie wrote:
> From: Dave Airlie<airlied@redhat.com>
>   int pci_set_vga_state(struct pci_dev *dev, bool decode,
> -		      unsigned int command_bits, bool change_bridge)
> +		      unsigned int command_bits, u32 flags)
>   {
>   	struct pci_bus *bus;
>   	struct pci_dev *bridge;
>   	u16 cmd;
>   	int rc;
>
> -	WARN_ON(command_bits&  ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY));
> +	WARN_ON((flags&  PCI_VGA_STATE_CHANGE_DECODES)&  (command_bits&  ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY)));

Minor thing, but I think the middle & should be a &&?

MM