From patchwork Thu Mar 4 19:50:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 83673 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 o24JoEJm023534 for ; Thu, 4 Mar 2010 19:50:49 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9FD5B9E75E; Thu, 4 Mar 2010 11:50:13 -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 142839E745 for ; Thu, 4 Mar 2010 11:50:11 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id B2CE020C210; Thu, 4 Mar 2010 20:50:10 +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-+--100644, 0.000-+--signed-off-by, 0.000-+--signedoffby 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.987-1--H*m:4716, 0.961-+--H*m:ffwll, 0.958-+--H*Ad:U*daniel.vetter Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 4BD6E20C16C; Thu, 4 Mar 2010 20:50:05 +0100 (CET) Received: from daniel by biene with local (Exim 4.71) (envelope-from ) id 1NnH3z-0001Ea-7U; Thu, 04 Mar 2010 20:50:28 +0100 From: Daniel Vetter To: Carl Worth Date: Thu, 4 Mar 2010 20:50:20 +0100 Message-Id: <1267732220-4716-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <87eik0ezwn.fsf@yoom.home.cworth.org> References: <87eik0ezwn.fsf@yoom.home.cworth.org> Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH] i915 XvMC: kill dead code X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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 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 19:50:49 +0000 (UTC) diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c index 8ba122b..457c89b 100644 --- a/src/i915_hwmc.c +++ b/src/i915_hwmc.c @@ -231,26 +231,6 @@ 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) || - !pXvMC->surfaces[xvmc_cmd->srfNo] || - !pXvMC->sfprivs[xvmc_cmd->srfNo]) { - xf86DrvMsg(scrn->scrnIndex, X_ERROR, - "[XvMC] i915 put image: Invalid parameters!\n"); - return 1; - } - - /* use char *buf to hold our surface offset...hacky! */ - buf = - (unsigned char *)pXvMC->sfprivs[xvmc_cmd->srfNo]-> - surface->bo->offset; - break; - default: - return 0; - } -#endif /* Pass the GEM object name through the pointer arg. */ buf = (void *)(uintptr_t)xvmc_cmd->handle; } @@ -295,10 +275,6 @@ static XF86MCAdaptorRec pAdapt = { .name = "Intel(R) Textured Video", .num_surfaces = ARRAY_SIZE(ppSI), .surfaces = ppSI, -#if 0 - .num_subpictures = ARRARY_SIZE(i915_subpicture_list), - .subpictures = i915_subpicture_list, -#endif .num_subpictures = 0, .subpictures = NULL, .CreateContext =