From patchwork Tue Jul 15 12:25:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Thierry X-Patchwork-Id: 4553481 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0857A9F463 for ; Tue, 15 Jul 2014 12:25:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 392F020172 for ; Tue, 15 Jul 2014 12:25:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4B2A420155 for ; Tue, 15 Jul 2014 12:25:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E792F6E599; Tue, 15 Jul 2014 05:25:40 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 291086E593 for ; Tue, 15 Jul 2014 05:25:39 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 15 Jul 2014 05:25:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,665,1400050800"; d="scan'208";a="570068696" Received: from michelth-linux.iwi.intel.com ([172.28.253.148]) by fmsmga002.fm.intel.com with ESMTP; 15 Jul 2014 05:25:38 -0700 From: Michel Thierry To: intel-gfx@lists.freedesktop.org Date: Tue, 15 Jul 2014 13:25:34 +0100 Message-Id: <1405427135-11377-8-git-send-email-michel.thierry@intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1405427135-11377-1-git-send-email-michel.thierry@intel.com> References: <1405427135-11377-1-git-send-email-michel.thierry@intel.com> Subject: [Intel-gfx] [PATCH 7/8] drm/i915: Add WaDisableInstructionShootdown:bdw X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.2 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 Instruction Shootdown in ROW_CHICKEN must be disabled. Signed-off-by: Michel Thierry --- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ff1acbe..2f0c759 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -5637,6 +5637,7 @@ enum punit_power_well { #define GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE (1<<3) #define GEN8_ROW_CHICKEN 0xe4f0 +#define INSTRUCTION_SHOOTDOWN_DISABLE (1<<9) #define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8) #define STALL_DOP_GATING_DISABLE (1<<5) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 64e3245..c16dcb3 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5405,8 +5405,10 @@ static void gen8_init_clock_gating(struct drm_device *dev) _MASKED_BIT_ENABLE(PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE)); /* WaDisableThreadStallDopClockGating:bdw */ - /* FIXME: Unclear whether we really need this on production bdw. */ + /* WaDisableInstructionShootdown:bdw */ + /* FIXME: Unclear whether we really need these on production bdw. */ I915_WRITE(GEN8_ROW_CHICKEN, + _MASKED_BIT_ENABLE(INSTRUCTION_SHOOTDOWN_DISABLE) | _MASKED_BIT_ENABLE(STALL_DOP_GATING_DISABLE)); /*