From patchwork Tue Dec 1 13:32:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 63949 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 nB1DXD5N002763 for ; Tue, 1 Dec 2009 13:33:13 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4EF69EFA7; Tue, 1 Dec 2009 05:33: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 592259EF85 for ; Tue, 1 Dec 2009 05:33:11 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 3F5AB20C21B; Tue, 1 Dec 2009 14:33: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-+--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.997-1--clip, 0.965-+--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 5A42320C209; Tue, 1 Dec 2009 14:32:56 +0100 (CET) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1NFSqe-0000nL-OC; Tue, 01 Dec 2009 14:32:56 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 1 Dec 2009 14:32:29 +0100 Message-Id: X-Mailer: git-send-email 1.6.5.3 In-Reply-To: <6b93d5c17f0fb97e8018db344c234e19e36f3120.1259673868.git.daniel.vetter@ffwll.ch> References: <6b93d5c17f0fb97e8018db344c234e19e36f3120.1259673868.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/7] Xv: kill an unnecessary if 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 f5c129b..e79933a 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -1230,26 +1230,25 @@ i830_clip_video_helper(ScrnInfoPtr scrn, Bool ret; RegionRec crtc_region_local; RegionPtr crtc_region = reg; + BoxRec crtc_box; /* * For overlay video, compute the relevant CRTC and * clip video to that */ - if (crtc_ret) { - BoxRec crtc_box; - xf86CrtcPtr crtc = i830_covering_crtc(scrn, dst, - adaptor_priv->desired_crtc, - &crtc_box); - - /* For textured video, we don't actually want to clip at all. */ - if (crtc && !adaptor_priv->textured) { - REGION_INIT(screen, &crtc_region_local, &crtc_box, 1); - crtc_region = &crtc_region_local; - REGION_INTERSECT(screen, crtc_region, crtc_region, - reg); - } - *crtc_ret = crtc; + xf86CrtcPtr crtc = i830_covering_crtc(scrn, dst, + adaptor_priv->desired_crtc, + &crtc_box); + + /* For textured video, we don't actually want to clip at all. */ + if (crtc && !adaptor_priv->textured) { + REGION_INIT(screen, &crtc_region_local, &crtc_box, 1); + crtc_region = &crtc_region_local; + REGION_INTERSECT(screen, crtc_region, crtc_region, + reg); } + *crtc_ret = crtc; + ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb, crtc_region, width, height); if (crtc_region != reg)