From patchwork Tue Jan 25 20:13:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bugzilla-daemon@freedesktop.org X-Patchwork-Id: 506711 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0PKDNE9019080 for ; Tue, 25 Jan 2011 20:13:44 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65B9C9EB34 for ; Tue, 25 Jan 2011 12:13:23 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 0030C9E754 for ; Tue, 25 Jan 2011 12:13:11 -0800 (PST) Received: by annarchy.freedesktop.org (Postfix, from userid 33) id E2A2013004E; Tue, 25 Jan 2011 12:13:11 -0800 (PST) From: bugzilla-daemon@freedesktop.org To: dri-devel@lists.freedesktop.org Subject: [Bug 33494] crash during (or at end) of map loading in ut2004 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Mesa X-Bugzilla-Component: Drivers/Gallium/r600 X-Bugzilla-Keywords: X-Bugzilla-Severity: major X-Bugzilla-Who: xoddark@gmail.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: medium X-Bugzilla-Assigned-To: dri-devel@lists.freedesktop.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: In-Reply-To: References: X-Bugzilla-URL: http://bugs.freedesktop.org/ Auto-Submitted: auto-generated MIME-Version: 1.0 Message-Id: <20110125201311.E2A2013004E@annarchy.freedesktop.org> Date: Tue, 25 Jan 2011 12:13:11 -0800 (PST) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 25 Jan 2011 20:13:44 +0000 (UTC) diff --git a/src/gallium/drivers/r600/r600_upload.c b/src/gallium/drivers/r600/r600_upload.c index 44102ff..ba19185 100644 --- a/src/gallium/drivers/r600/r600_upload.c +++ b/src/gallium/drivers/r600/r600_upload.c @@ -103,7 +103,11 @@ int r600_upload_buffer(struct r600_upload *upload, unsigned offset, } in_ptr = in_buffer->user_buffer; - memcpy(upload->ptr + upload->offset, (uint8_t *) in_ptr + offset, size); + uint8_t * ptr_src = (uint8_t *) upload->ptr + upload->offset; + uint8_t * ptr_dest = (uint8_t *) in_ptr + offset; + //R600_ERR("memcpy src %d dest %d size %d\n", ptr_src, ptr_dest, size); + fprintf(stdout, "memcpy src %p dest %p size %d\n", ptr_src, ptr_dest, size); + memcpy(ptr_src, ptr_dest, size);