From patchwork Fri Sep 28 22:08:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anuj Phogat X-Patchwork-Id: 10620377 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A6F8E15A6 for ; Fri, 28 Sep 2018 22:08:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98D5B2BDA9 for ; Fri, 28 Sep 2018 22:08:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CE6D2BDD4; Fri, 28 Sep 2018 22:08:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3AB202BDA9 for ; Fri, 28 Sep 2018 22:08:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2FC276E28B; Fri, 28 Sep 2018 22:08:49 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id D99106E261 for ; Fri, 28 Sep 2018 22:08:47 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id i4-v6so4766835pgq.9 for ; Fri, 28 Sep 2018 15:08:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dwQlxl2qmo1FZbjACBrcxvn6UtO9q9XFYSUEUuU+U7M=; b=NBPWnG4ml0ChRn3OBr+kfOdoMa/AkhBbXiap3RBX6jNMwrEuLE011EQL4KhaApwEPf bpWEJWwrSPGg4p16kVdXf4Q5WrbbyeL6r4SFGbKbsrPadXg3UiO7kL7kmTJrGBT8ZpEk kwlvWdr4FWZCDIi/RR75f6dJAxx1qw/RwRxN3mFdHYmM0Fxk5ilIVuNDcaxWy807WmAD mRkqJdXR8QCUilpdpE1SiubUSAXSqGT1Kj2MDYXEU+3LOAYNlIZ5YuKFCyVpzO563TMH ZBcWuU77KVPYz58kvi3yzCPVs3xaaBCUAQTljXgLlULqCF1+aUU+TGv1/srcuXc7nRS7 7nEQ== X-Gm-Message-State: ABuFfoiA/kWH6C3gEjxU8LyycrZjwjHaH6eo5BnXBcOa83/f8rGrLleN bx5kCNNGvCX1T66hiiDAffJ79NNo X-Google-Smtp-Source: ACcGV63M82G4Sm3VHReLIV/gmnCRt7+Z1h58BTZ/jMMvylt4B8KhFH2FbVD6C9VnkuA36KencVKUBA== X-Received: by 2002:a63:1e5c:: with SMTP id p28-v6mr513074pgm.376.1538172527209; Fri, 28 Sep 2018 15:08:47 -0700 (PDT) Received: from ticktock.ak.intel.com ([134.134.139.83]) by smtp.googlemail.com with ESMTPSA id o9-v6sm8490561pgn.30.2018.09.28.15.08.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Sep 2018 15:08:46 -0700 (PDT) From: Anuj Phogat To: intel-gfx@lists.freedesktop.org Date: Fri, 28 Sep 2018 15:08:46 -0700 Message-Id: <20180928220846.25130-1-anuj.phogat@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180928220648.24899-1-anuj.phogat@gmail.com> References: <20180928220648.24899-1-anuj.phogat@gmail.com> Subject: [Intel-gfx] [PATCH V2] drm/i915/icl:Add Wa_1606682166 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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-Virus-Scanned: ClamAV using ClamSMTP Incorrect TDL's SSP address shift in SARB for 16:6 & 18:8 modes. Disable the Sampler state prefetch functionality in the SARB by programming 0xB000[30] to '1'. This is to be done at boot time and the feature must remain disabled permanently. Fixes flaky tex-mip-level-selection* piglit tests with Mesa i965 driver. Cc: Radhakrishna Sripada Signed-off-by: Anuj Phogat --- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_workarounds.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index dd422c4..528b449 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -7475,6 +7475,7 @@ enum { #define GEN7_SARCHKMD _MMIO(0xB000) #define GEN7_DISABLE_DEMAND_PREFETCH (1 << 31) +#define GEN7_DISABLE_SAMPLER_PREFETCH (1 << 30) #define GEN7_L3SQCREG1 _MMIO(0xB010) #define VLV_B0_WA_L3SQCREG1_VALUE 0x00D30000 diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c index 620111b..5589611 100644 --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c @@ -939,7 +939,8 @@ static void icl_gt_workarounds_apply(struct drm_i915_private *dev_priv) if (IS_ICL_REVID(dev_priv, ICL_REVID_A0, ICL_REVID_C0)) I915_WRITE(GEN7_SARCHKMD, I915_READ(GEN7_SARCHKMD) | - GEN7_DISABLE_DEMAND_PREFETCH); + GEN7_DISABLE_DEMAND_PREFETCH | + GEN7_DISABLE_SAMPLER_PREFETCH); } static void tgl_gt_workarounds_apply(struct drm_i915_private *dev_priv)