From patchwork Sun Jan 13 01:03:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Graunke X-Patchwork-Id: 1969421 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 65467DF215 for ; Sun, 13 Jan 2013 01:03:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51477E62BA for ; Sat, 12 Jan 2013 17:03:18 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from hapkido.dreamhost.com (hapkido.dreamhost.com [66.33.216.122]) by gabe.freedesktop.org (Postfix) with ESMTP id 014FDE5EC8 for ; Sat, 12 Jan 2013 17:03:06 -0800 (PST) Received: from homiemail-a37.g.dreamhost.com (caiajhbdcagg.dreamhost.com [208.97.132.66]) by hapkido.dreamhost.com (Postfix) with ESMTP id 714D9DD8F0 for ; Sat, 12 Jan 2013 17:03:06 -0800 (PST) Received: from homiemail-a37.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a37.g.dreamhost.com (Postfix) with ESMTP id BF8D320806B; Sat, 12 Jan 2013 17:03:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=whitecape.org; h=from:to :cc:subject:date:message-id; s=whitecape.org; bh=ztz3IQSQ+gljmc6 O/jx2FHXk71U=; b=hi9RiL5oMImnDwZ1Zs+xhLnw8CmoYUFZEuxD+W6NQQc7SBw HKBrut5iC9eo6g/bmXUKLWJNf7VVa9Ne7Sw6qGClIlqwXl4IjLG4I5Ci7r2ZUq5Q r3QEokQXVV1lVPlxD2C9gkUMfg635w9tTY7g41UVHykcl8R+w9zDntVB8ick= Received: from localhost.localdomain (static-50-43-15-186.bvtn.or.frontiernet.net [50.43.15.186]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: kenneth@whitecape.org) by homiemail-a37.g.dreamhost.com (Postfix) with ESMTPSA id 180E7208069; Sat, 12 Jan 2013 17:03:04 -0800 (PST) From: Kenneth Graunke To: intel-gfx@lists.freedesktop.org Date: Sat, 12 Jan 2013 17:03:24 -0800 Message-Id: <1358039004-4090-1-git-send-email-kenneth@whitecape.org> X-Mailer: git-send-email 1.8.1 Cc: Paul Berry Subject: [Intel-gfx] [PATCH] intel/aub: Actually run BLT batches on the blit ring. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org We didn't set the ring flag for BLT batches, so they got run on the render ring. Shenanigans ensued, especially when we sent commands that were only valid on the BLT ring. Cc: Paul Berry Cc: Eric Anholt Reviewed-by: Eric Anholt --- intel/intel_bufmgr_gem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 512bc6f..32afd73 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -2010,6 +2010,8 @@ aub_build_dump_ringbuffer(drm_intel_bufmgr_gem *bufmgr_gem, if (ring_flag == I915_EXEC_BSD) ring = AUB_TRACE_TYPE_RING_PRB1; + else if (ring_flag == I915_EXEC_BLT) + ring = AUB_TRACE_TYPE_RING_PRB2; /* Make a ring buffer to execute our batchbuffer. */ memset(ringbuffer, 0, sizeof(ringbuffer));