From patchwork Tue Jul 15 12:25:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Thierry X-Patchwork-Id: 4553451 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6E963C0514 for ; Tue, 15 Jul 2014 12:25:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B50582012B for ; Tue, 15 Jul 2014 12:25:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EDAA120117 for ; Tue, 15 Jul 2014 12:25:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C2E46E591; 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 417ED6E591 for ; Tue, 15 Jul 2014 05:25:38 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 15 Jul 2014 05:25:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,665,1400050800"; d="scan'208";a="570068692" Received: from michelth-linux.iwi.intel.com ([172.28.253.148]) by fmsmga002.fm.intel.com with ESMTP; 15 Jul 2014 05:25:37 -0700 From: Michel Thierry To: intel-gfx@lists.freedesktop.org Date: Tue, 15 Jul 2014 13:25:33 +0100 Message-Id: <1405427135-11377-7-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 6/8] drm/i915: Add WaIncreaseTagClockTimer: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 Workaround requires programing L3 tag clock timing register. Signed-off-by: Michel Thierry --- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_pm.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 55ea3bf..ff1acbe 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4709,6 +4709,10 @@ enum punit_power_well { #define GEN8_L3SQCREG1 0xb100 #define GEN8_L3SQCREG1_DEFAULT_VALUE 0x784000 +#define GEN8_L3CNTLREG1 0xb10c +#define GEN8_TAG_CLK_OFFTIME (1<<23) +#define GEN8_TAG_CLK_OFFTIME_MASK (~((1<<23) | (1<<22) | (1<<21) | (1<<20))) + #define GEN8_L3SQCREG4 0xb118 #define GEN8_PIPELINE_FLUSH_COHERENT_LINES (1<<21) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index b60fbd2..64e3245 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5496,6 +5496,15 @@ static void gen8_init_clock_gating(struct drm_device *dev) /* WaFlushCoherentL3CacheLinesAtContextSwitch:bdw */ I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) | GEN8_PIPELINE_FLUSH_COHERENT_LINES); + + /* + * WaIncreaseTagClockTimer:bdw + * This register is not masked and the default value is not all zero. + * Use the mask with and to clear out bits 23:20. + */ + I915_WRITE(GEN8_L3CNTLREG1, (I915_READ(GEN8_L3CNTLREG1) & + GEN8_TAG_CLK_OFFTIME_MASK) | + GEN8_TAG_CLK_OFFTIME); } static void haswell_init_clock_gating(struct drm_device *dev)