From patchwork Tue Jun 16 19:25:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: arun.siluvery@linux.intel.com X-Patchwork-Id: 6619731 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 26FE49F399 for ; Tue, 16 Jun 2015 19:25:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 458242080D for ; Tue, 16 Jun 2015 19:25:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 26E912080F for ; Tue, 16 Jun 2015 19:25:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B6BA96E51B; Tue, 16 Jun 2015 12:25:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 0AA1C6E560 for ; Tue, 16 Jun 2015 12:25:33 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 16 Jun 2015 12:25:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,627,1427785200"; d="scan'208";a="728659705" Received: from asiluver-linux.isw.intel.com ([10.102.226.85]) by fmsmga001.fm.intel.com with ESMTP; 16 Jun 2015 12:25:32 -0700 From: Arun Siluvery To: intel-gfx@lists.freedesktop.org Date: Tue, 16 Jun 2015 20:25:22 +0100 Message-Id: <1434482725-21823-4-git-send-email-arun.siluvery@linux.intel.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1434482725-21823-1-git-send-email-arun.siluvery@linux.intel.com> References: <1434482725-21823-1-git-send-email-arun.siluvery@linux.intel.com> Subject: [Intel-gfx] [PATCH v4 3/6] drm/i915/gen8: Add WaDisableCtxRestoreArbitration workaround X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In Indirect and Per context w/a batch buffer, +WaDisableCtxRestoreArbitration Signed-off-by: Rafael Barbalho Signed-off-by: Arun Siluvery --- drivers/gpu/drm/i915/intel_lrc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index dcc3f2e..c9875f6 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1091,10 +1091,11 @@ static int gen8_init_indirectctx_bb(struct intel_engine_cs *ring, index = offset; - /* FIXME: fill one cacheline with NOOPs. - * Replace these instructions with WA - */ - while (index < (offset + 16)) + /* WaDisableCtxRestoreArbitration:bdw,chv */ + cmd[index++] = MI_ARB_ON_OFF | MI_ARB_DISABLE; + + /* padding */ + while (((unsigned long) (cmd + index) % CACHELINE_BYTES) != 0) cmd[index++] = MI_NOOP; /* @@ -1126,13 +1127,10 @@ static int gen8_init_perctx_bb(struct intel_engine_cs *ring, index = offset; - /* FIXME: fill one cacheline with NOOPs. - * Replace these instructions with WA - */ - while (index < (offset + 16)) - cmd[index++] = MI_NOOP; + /* WaDisableCtxRestoreArbitration:bdw,chv */ + cmd[index++] = MI_ARB_ON_OFF | MI_ARB_ENABLE; - cmd[index - 1] = MI_BATCH_BUFFER_END; + cmd[index++] = MI_BATCH_BUFFER_END; kunmap_atomic(cmd);