From patchwork Tue Aug 11 14:06:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 40669 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 n7BE6vh7022262 for ; Tue, 11 Aug 2009 14:06:57 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CABF9EE09; Tue, 11 Aug 2009 07:06:56 -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 559F49EDF0 for ; Tue, 11 Aug 2009 07:06:52 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id A249120C21B; Wed, 12 Aug 2009 00:00:20 +0200 (CEST) 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-+--signed-off-by, 0.000-+--signedoffby, 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.998-1--pitches, 0.973-+--H*m:ffwll, 0.971-+--H*Ad:U*daniel.vetter Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 75C2720C21C; Wed, 12 Aug 2009 00:00:07 +0200 (CEST) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1Mas0A-0003eG-N6; Tue, 11 Aug 2009 16:06:58 +0200 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 11 Aug 2009 16:06:33 +0200 Message-Id: <10614c7dd4ecbb1b4d3dd6a15b949cb389053f1f.1249999028.git.daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: References: <0328734a90544a6cd72d9eaf64015db9d3462921.1249999028.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 03/18] Xv: rename i830_display_video to i830_display_overlay 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 This function only programs the overlay and is never called for textured video. Make this obvious. Signed-off-by: Daniel Vetter --- src/i830_video.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i830_video.c b/src/i830_video.c index d7ea568..1f17ae1 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2060,7 +2060,7 @@ i830_update_scaling_factors(I830OverlayRegPtr overlay, } static void -i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, int id, short width, short height, int dstPitch, int x1, int y1, int x2, int y2, BoxPtr dstBox, short src_w, short src_h, short drw_w, short drw_h) @@ -2071,7 +2071,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, int planar; uint32_t swidth, swidthsw, sheigth; int tmp; - Bool scaleChanged = FALSE; + Bool scaleChanged; OVERLAY_DEBUG("I830DisplayVideo: %dx%d (pitch %d)\n", width, height, dstPitch); @@ -2536,7 +2536,7 @@ I830PutImage(ScrnInfoPtr pScrn, } if (!pPriv->textured) { - i830_display_video(pScrn, crtc, destId, width, height, dstPitch, + i830_display_overlay(pScrn, crtc, destId, width, height, dstPitch, x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h); @@ -2885,7 +2885,7 @@ I830DisplaySurface(XF86SurfacePtr surface, if (!pI830Priv->textured && pI830->overlayOn && pI830Priv->doubleBuffer) pI830Priv->currentBuf = !((INREG(DOVSTA) & OC_BUF) >> 20); - i830_display_video(pScrn, crtc, surface->id, surface->width, surface->height, + i830_display_overlay(pScrn, crtc, surface->id, surface->width, surface->height, surface->pitches[0], x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);