From patchwork Thu Oct 18 09:49:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1609561 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 81A60DFB34 for ; Thu, 18 Oct 2012 10:14:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 74ED5A0A0F for ; Thu, 18 Oct 2012 03:14:17 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id ED5C09E74C for ; Thu, 18 Oct 2012 02:32:05 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id n13so2055074eaa.36 for ; Thu, 18 Oct 2012 02:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=F1oY2LxlN0QmO39Cfrk6zDhbcWI9NRhffh2xgvsSJNw=; b=glbrqHzszfdG8sI/3N15Z/1Wq9LBvfrpOSe15r6RMS5+mbm5Xe2W2Mh29PXUNvzV69 LYElx3+4OL66YOsLmgM1RN8OHDOcLwK5Uj4M9F384hw3KNwMoYgXYP3tkYbs8TXdH4Jr wSeA1BKB+1dh5W5+Qd/SgCQFAF44wfsFiGTRU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=F1oY2LxlN0QmO39Cfrk6zDhbcWI9NRhffh2xgvsSJNw=; b=NSGj1Bmz1hPxW++Kwan2tuIgMNTWwEEePNXsUPzbRh/uPdmZkHGnEPKQq5Dz+eBnLl egTfwZJGpCvo1A+yr2G11SRwF2tj+Kru+Auh0dqTraIxcnj2iw1aVhHJFfD8vTus2yfd 8azGCKZOVJw8+uEoY953GpdKZThgJjg+vspkSvGsz5IJohyecwHdeZjIunv1Wr/CsJy3 H9m/Dd1psal4sjynm5zgmDJ6llt6+TXt4MLoBUBlvbmdGK47fgVFz5LUBa1xW8lHfv8o bGy0SfA2PPClQonQHpCHt+8pUOb/JR3xogwrvvrze5WJgsLpvMEn7x4AiSrxoMnYqGmx jDng== Received: by 10.14.203.69 with SMTP id e45mr30372643eeo.38.1350552725126; Thu, 18 Oct 2012 02:32:05 -0700 (PDT) Received: from hummel.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id k2sm6200817eep.15.2012.10.18.02.32.04 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 02:32:04 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 18 Oct 2012 11:49:51 +0200 Message-Id: <1350553794-5534-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350553794-5534-1-git-send-email-daniel.vetter@ffwll.ch> References: <1350553794-5534-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQn8VyznFd8JNhjjpBM4ltMY1ZkQrVazncEUuphTHgZqr4BesW22Q9XWP19F+PaLdsZcJ0qK Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/5] drm/i915: implement WaDisableRenderCachePipelinedFlush 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 Comment says for eaglelake/cantiga, but it's listed in the ilk table, too. So apply it to both. Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index a4162dd..1970c54 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -661,6 +661,7 @@ #define MI_ARB_DISPLAY_PRIORITY_B_A (1 << 0) /* display B > display A */ #define CACHE_MODE_0 0x02120 /* 915+ only */ +#define CM0_PIPELINED_RENDER_FLUSH_DISABLE (1<<8) #define CM0_IZ_OPT_DISABLE (1<<6) #define CM0_ZR_OPT_DISABLE (1<<5) #define CM0_STC_EVICT_DISABLE_LRA_SNB (1<<5) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 72f41aa..aa77639 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3397,6 +3397,10 @@ static void ironlake_init_clock_gating(struct drm_device *dev) I915_WRITE(_3D_CHICKEN2, _3D_CHICKEN2_WM_READ_PIPELINED << 16 | _3D_CHICKEN2_WM_READ_PIPELINED); + + /* WaDisableRenderCachePipelinedFlush */ + I915_WRITE(CACHE_MODE_0, + _MASKED_BIT_ENABLE(CM0_PIPELINED_RENDER_FLUSH_DISABLE)); } static void gen6_init_clock_gating(struct drm_device *dev) @@ -3728,6 +3732,10 @@ static void g4x_init_clock_gating(struct drm_device *dev) if (IS_GM45(dev)) dspclk_gate |= DSSUNIT_CLOCK_GATE_DISABLE; I915_WRITE(DSPCLK_GATE_D, dspclk_gate); + + /* WaDisableRenderCachePipelinedFlush */ + I915_WRITE(CACHE_MODE_0, + _MASKED_BIT_ENABLE(CM0_PIPELINED_RENDER_FLUSH_DISABLE)); } static void crestline_init_clock_gating(struct drm_device *dev)