From patchwork Thu Mar  4 00:44:25 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Carl Worth <cworth@cworth.org>
X-Patchwork-Id: 83482
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o240iUra015101
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 4 Mar 2010 00:45:05 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id E4EC39E818;
	Wed,  3 Mar 2010 16:44:29 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from olra.theworths.org (u15218177.onlinehome-server.com
	[82.165.184.25])
	by gabe.freedesktop.org (Postfix) with ESMTP id EBD839E734
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  3 Mar 2010 16:44:27 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 509A2431FBC;
	Wed,  3 Mar 2010 16:44:37 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new,
	port 10024)
	with ESMTP id c1nPCkcSa-wa; Wed,  3 Mar 2010 16:44:36 -0800 (PST)
Received: from yoom.home.cworth.org (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id A4BE2431FAE;
	Wed,  3 Mar 2010 16:44:36 -0800 (PST)
Received: by yoom.home.cworth.org (Postfix, from userid 1000)
	id 5FDF825427B; Wed,  3 Mar 2010 16:44:26 -0800 (PST)
From: Carl Worth <cworth@cworth.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org
In-Reply-To: <cover.1267560136.git.daniel.vetter@ffwll.ch>
References: <cover.1267560136.git.daniel.vetter@ffwll.ch>
Date: Wed, 03 Mar 2010 16:44:25 -0800
Message-ID: <87635c9aqe.fsf@yoom.home.cworth.org>
MIME-Version: 1.0
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [Intel-gfx] [PATCH 00/18] rip out i830_memory, part 2: xvmc
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/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
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 04 Mar 2010 00:45:05 +0000 (UTC)


diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index 4395cdc..c0b0bb8 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -797,6 +797,7 @@ static int i915_xvmc_put_image(ScrnInfoPtr scrn,
 	int ret;
 
 	if (FOURCC_XVMC == id) {
+#if 0
 		switch (xvmc_cmd->command) {
 		case INTEL_XVMC_COMMAND_DISPLAY:
 			if ((xvmc_cmd->srfNo >= I915_XVMC_MAX_SURFACES) ||
@@ -815,6 +816,9 @@ static int i915_xvmc_put_image(ScrnInfoPtr scrn,
 		default:
 			return 0;
 		}
+#endif
+		/* Pass the GEM object name through the pointer arg. */
+		buf = (void *)(uintptr_t)xvmc_cmd->handle;
 	}
 
 	ret =