From patchwork Mon Oct 26 13:15:25 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Daniel Vetter <daniel.vetter@ffwll.ch>
X-Patchwork-Id: 55877
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9QDFLs8010424
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Mon, 26 Oct 2009 13:15:22 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id BA1FC9E976;
	Mon, 26 Oct 2009 06:15:21 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch
	[157.161.49.187])
	by gabe.freedesktop.org (Postfix) with ESMTP id AC2AC9E976
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 26 Oct 2009 06:15:18 -0700 (PDT)
Received: by mail.ffwll.ch (Postfix, from userid 1000)
	id 7B41F20C221; Mon, 26 Oct 2009 14:15:17 +0100 (CET)
X-Spam-ASN: 
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch
X-Spam-Level: 
X-Spam-Hammy: 0.000-+--signedoffby, 0.000-+--signed-off-by, 0.000-+--100644
X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00
	autolearn=ham version=3.2.5
X-Spam-Spammy: 0.999-1--painting, 0.966-+--H*Ad:U*daniel.vetter,
	0.963-+--H*m:ffwll
Received: from biene (unknown [192.168.23.129])
	by mail.ffwll.ch (Postfix) with ESMTP id C4E4C20C215;
	Mon, 26 Oct 2009 14:15:06 +0100 (CET)
Received: from daniel by biene with local (Exim 4.69)
	(envelope-from <daniel.vetter@ffwll.ch>)
	id 1N2PQ1-00048u-Qw; Mon, 26 Oct 2009 14:15:29 +0100
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: intel-gfx@lists.freedesktop.org
Date: Mon, 26 Oct 2009 14:15:25 +0100
Message-Id: 
 <5114876d11f3facc1dd2eb23e88bf8a84d67b72b.1256562682.git.daniel.vetter@ffwll.ch>
X-Mailer: git-send-email 1.6.4.3
In-Reply-To: 
 <22ebf9a09fb13aacc17f5e00dce5b681f45810c0.1256562682.git.daniel.vetter@ffwll.ch>
References: <cover.1256562682.git.daniel.vetter@ffwll.ch>
	<22ebf9a09fb13aacc17f5e00dce5b681f45810c0.1256562682.git.daniel.vetter@ffwll.ch>
In-Reply-To: <cover.1256562682.git.daniel.vetter@ffwll.ch>
References: <cover.1256562682.git.daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [Intel-gfx] [PATCH 2/3] Xv overlay: set default color-key to black
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
MIME-Version: 1.0
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org


diff --git a/src/i830_driver.c b/src/i830_driver.c
index 867047c..7f8f5d4 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -803,10 +803,7 @@ static void I830XvInit(ScrnInfoPtr scrn)
 					&(intel->colorKey))) {
 		from = X_CONFIG;
 	} else {
-		intel->colorKey =
-		    (1 << scrn->offset.red) | (1 << scrn->offset.green) |
-		    (((scrn->mask.blue >> scrn->offset.blue) - 1) <<
-		     scrn->offset.blue);
+		intel->colorKey = 0;
 		from = X_DEFAULT;
 	}
 	xf86DrvMsg(scrn->scrnIndex, from, "video overlay key set to 0x%x\n",