From patchwork Wed Dec 2 11:28:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 64238 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 nB2BT4eO013650 for ; Wed, 2 Dec 2009 11:29:04 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DCA7C9E7C1; Wed, 2 Dec 2009 03:29:03 -0800 (PST) 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 941D79E73D for ; Wed, 2 Dec 2009 03:29:02 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 57FA820C214; Wed, 2 Dec 2009 12:29:01 +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.964-+--H*Ad:U*daniel.vetter, 0.961-+--H*m:ffwll, 0.950-+--H*r:mail.ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id DAC7120C15E; Wed, 2 Dec 2009 12:28:55 +0100 (CET) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1NFnOC-0005fd-9p; Wed, 02 Dec 2009 12:28:56 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Wed, 2 Dec 2009 12:28:51 +0100 Message-Id: <1259753332-21766-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.5.3 In-Reply-To: <20091202091328.GA14384@viiv.ffwll.ch> References: <20091202091328.GA14384@viiv.ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] XvMC: hook up bo passthrough for i915 class hw X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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_video.c b/src/i830_video.c index 8457764..b549e51 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -1566,9 +1566,15 @@ I830PutImageTextured(ScrnInfoPtr scrn, drm_intel_bo_gem_create_from_name(intel->bufmgr, "xvmc surface", (uintptr_t)buf); + } else if (IS_I915(intel) + && !(IS_I915G(intel) || IS_I915GM(intel))) { + adaptor_priv->buf = + drm_intel_bo_gem_create_from_name(intel->bufmgr, + "XvMC surface", + (uintptr_t) buf); } else { - /* XXX: i915 is not support and needs some serious care. - * grep for KMS in i915_hwmc.c */ + /* XXX: i915G/GM is not support and needs some serious + * care. grep for KMS in i915_hwmc.c */ return BadAlloc; } } else { diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c index 8be52f2..bd02215 100644 --- a/src/i915_hwmc.c +++ b/src/i915_hwmc.c @@ -817,7 +817,7 @@ static int i915_xvmc_put_image(ScrnInfoPtr scrn, /* use char *buf to hold our surface offset...hacky! */ buf = (unsigned char *)pXvMC->sfprivs[xvmc_cmd->srfNo]-> - surface->offset; + surface->bo->handle; break; default: return 0;