From patchwork Fri Oct 26 16:34:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1652761 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id B9D8F40135 for ; Fri, 26 Oct 2012 16:35:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD7A59EC2A for ; Fri, 26 Oct 2012 09:35:17 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-gh0-f177.google.com (mail-gh0-f177.google.com [209.85.160.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 1721C9E802 for ; Fri, 26 Oct 2012 09:35:05 -0700 (PDT) Received: by mail-gh0-f177.google.com with SMTP id f20so567521ghb.36 for ; Fri, 26 Oct 2012 09:35:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=GjUBucYVnDPQpiN9DhsayHZoOk0vg62LD7nPVQitzjg=; b=xp+sADHPGYEuT3Wc1D9ec1YsJyD0w1bUBfQgVoRZOJNX0Lvt8LJscmePgPFkd33NIw 9fn8ExhGqQEUFnhvASG58REE7CKI9IqEajx8KwsyxTL30+X3l60gOJxsRbxLRWeSTCcK Rt+3yj8A3rMqOK20Jcxr9yNugAM08m412xZFUD221CSp5uG2/jhYKm6RqXggP/tlyE8Z nIc3mcHPLW2iuoIH0E3Ey7zWaOXtrYx2dHoPPCGUAOY5srlhB5snHLSmlscRpt6PH222 hg4hwfXdSCotvoNqfFD3R441zhUt0TNqPt1FBXcBJIEiYMhMVUcoZ7IJYibGU6q9JWZP e53g== Received: by 10.236.151.103 with SMTP id a67mr23015717yhk.122.1351269305458; Fri, 26 Oct 2012 09:35:05 -0700 (PDT) Received: from vicky.domain.invalid ([187.112.123.173]) by mx.google.com with ESMTPS id l35sm1854568yhi.12.2012.10.26.09.35.03 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Oct 2012 09:35:04 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 26 Oct 2012 14:34:50 -0200 Message-Id: <1351269290-3910-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: implement WaMbcDriverBootEnable on Haswell 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 From: Paulo Zanoni Also document the WA name for the previous gens that implement it. Signed-off-by: Paulo Zanoni Reviewed-by: Jani Nikula --- drivers/gpu/drm/i915/intel_pm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 59068be..150aebd 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3450,6 +3450,7 @@ static void gen6_init_clock_gating(struct drm_device *dev) ILK_DPARBUNIT_CLOCK_GATE_ENABLE | ILK_DPFDUNIT_CLOCK_GATE_ENABLE); + /* WaMbcDriverBootEnable */ I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) | GEN6_MBCTL_ENABLE_BOOT_FETCH); @@ -3520,6 +3521,10 @@ static void haswell_init_clock_gating(struct drm_device *dev) I915_WRITE(CACHE_MODE_1, _MASKED_BIT_ENABLE(PIXEL_SUBSPAN_COLLECT_OPT_DISABLE)); + /* WaMbcDriverBootEnable */ + I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) | + GEN6_MBCTL_ENABLE_BOOT_FETCH); + /* XXX: This is a workaround for early silicon revisions and should be * removed later. */ @@ -3595,6 +3600,7 @@ static void ivybridge_init_clock_gating(struct drm_device *dev) intel_flush_display_plane(dev_priv, pipe); } + /* WaMbcDriverBootEnable */ I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) | GEN6_MBCTL_ENABLE_BOOT_FETCH); @@ -3647,6 +3653,7 @@ static void valleyview_init_clock_gating(struct drm_device *dev) I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) | GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB); + /* WaMbcDriverBootEnable */ I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) | GEN6_MBCTL_ENABLE_BOOT_FETCH);