From patchwork Tue Aug 11 14:06:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 40682 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 n7BE7S1N022413 for ; Tue, 11 Aug 2009 14:07:28 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E19B39EE09; Tue, 11 Aug 2009 07:07:27 -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 8EFB29EFD0 for ; Tue, 11 Aug 2009 07:07:21 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 71B0C20C22F; Wed, 12 Aug 2009 00:00:50 +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-+--100644, 0.000-+--insertions, 0.000-+--deletions X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id CF76420C232; Wed, 12 Aug 2009 00:00:08 +0200 (CEST) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1Mas0C-0003ez-6H; Tue, 11 Aug 2009 16:07:00 +0200 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 11 Aug 2009 16:06:48 +0200 Message-Id: <4ecba8b5ea6e1fe8b849aeb07683b210031f900a.1249999028.git.daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <6946914c42ba2bb0f6f7b6d1351f33af53a145fd.1249999028.git.daniel.vetter@ffwll.ch> References: <0328734a90544a6cd72d9eaf64015db9d3462921.1249999028.git.daniel.vetter@ffwll.ch> <10614c7dd4ecbb1b4d3dd6a15b949cb389053f1f.1249999028.git.daniel.vetter@ffwll.ch> <891b387c6b31972a3e339508e57bd660b2991a17.1249999028.git.daniel.vetter@ffwll.ch> <2096013512e0099bfbb89439943c1b70cccabc92.1249999028.git.daniel.vetter@ffwll.ch> <8a3ddc0d78dcb40a14f8037b81cf202eaa40c301.1249999028.git.daniel.vetter@ffwll.ch> <3e0435569d2d7f58d58eb2f7c8a6952cc29b6934.1249999028.git.daniel.vetter@ffwll.ch> <52250eeaf73398c9c1f91ca7b2317f785f8eba56.1249999028.git.daniel.vetter@ffwll.ch> <3a4e39fa527e6f1bec9306a0c9d7b69b222532a6.1249999028.git.daniel.vetter@ffwll.ch> <06188abbed359c266f2033d8b3b28aa0aaf8aada.1249999028.git.daniel.vetter@ffwll.ch> <3f8b26f517d6bea6dc326136b6e9ea9d210e9a5a.1249999028.git.daniel.vetter@ffwll.ch> <361705901f128de9afac9b43d386abf0be87a5b3.1249999028.git.daniel.vetter@ffwll.ch> <6946914c42ba2bb0f6f7b6d1351f33af53a145fd.1249999028.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 18/18] debug stuff 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 --- src/i830_video.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/i830_video.c b/src/i830_video.c index 340f452..844732a 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -118,7 +118,7 @@ static Atom xvSyncToVblank; #define IMAGE_MAX_HEIGHT_LEGACY 1088 /* overlay debugging printf function */ -#if 0 +#if 1 #define OVERLAY_DEBUG ErrorF #else #define OVERLAY_DEBUG if (0) ErrorF @@ -2210,15 +2210,32 @@ ums_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, overlay->OCMD = i830_overlay_cmd(id, planar); + OVERLAY_DEBUG("DSPARB: %x, FW_BLC: %x, FW_BLC2: %x\n", + INREG(DSPARB), INREG(0x020d8), INREG(0x020dc)); + OVERLAY_DEBUG("saveDSPARB: %x\n", pI830->saveDSPARB); /* make sure the overlay is on */ i830_overlay_on (pScrn); /* and show this frame */ + OVERLAY_DEBUG("OSTRIDE: %x, SWIDTH: %x, SWIDTHSW: %x, SHEIGHT: %x, " + "UVSCALE: %x, UVSCALEV: %x, U_OFF: %x, V_OFF: %x\n", + overlay->OSTRIDE, overlay->SWIDTH, overlay->SWIDTHSW, + overlay->SHEIGHT, overlay->UVSCALE, overlay->UVSCALEV, + overlay->OBUF_0Y - overlay->OBUF_0U, + overlay->OBUF_0Y - overlay->OBUF_0V); + /*OVERLAY_DEBUG("Y_HCOEFFS\n"); + for (i = 0; i < N_HORIZ_Y_TAPS * N_PHASES; i++) + OVERLAY_DEBUG(" %x,\n", overlay->Y_HCOEFS[i]); + OVERLAY_DEBUG("UV_HCOEFFS\n"); + for (i = 0; i < N_HORIZ_UV_TAPS * N_PHASES; i++) + OVERLAY_DEBUG(" %x,\n", overlay->UV_HCOEFS[i]);*/ + i830_overlay_continue (pScrn, scaleChanged); if (xvmc_passthrough(id, pPriv->rotation)) return TRUE; /* unpin the old buffer and exchange buffers */ + /* should we have a sync here ?*/ if (pPriv->oldBuf_pinned) { drm_intel_bo_unpin(pPriv->oldBuf); } @@ -2274,6 +2291,8 @@ i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, src_w = src_h; src_h = tmp; } + OVERLAY_DEBUG("x1: %i, x2: %i, drw_w: %i, src_w: %i, width: %i\n", + x1, x2, drw_w, src_w, width); if (pI830->use_drmmode_overlay) return drmmode_overlay_put_image(pScrn, crtc, id, width, height, dstPitch,